diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2007-05-08 00:10:54 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2007-05-08 00:10:54 -0400 |
| commit | 5113a6e32b298671c86ae7da097bcd24540cebc9 (patch) | |
| tree | 48a74869e09a986ab8a411eb9fd5109308e1e080 /e2fsck | |
| parent | a25d231a8a153f48984f84f44a6b548b779cf6b1 (diff) | |
| download | e2fsprogs-5113a6e32b298671c86ae7da097bcd24540cebc9.tar.gz | |
Fix mke2fs and debugfs to support large (> 16 bit) uid's and gid's
Mke2fs is supposed to set the uid/gid ownership of the root directory when
a non-rooot user creates the filesystem. This wasn't working correctly
if the uid/gid was > 16 bits. In additional, debugfs wasn't displaying
large uid/gid's correctly. This patch fixes these two programs.
Signed-off-by: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
Diffstat (limited to 'e2fsck')
| -rw-r--r-- | e2fsck/ChangeLog | 5 | ||||
| -rw-r--r-- | e2fsck/message.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog index 18771099..4c14041f 100644 --- a/e2fsck/ChangeLog +++ b/e2fsck/ChangeLog @@ -1,3 +1,8 @@ +2007-05-08 Theodore Tso <tytso@mit.edu> + + * message.c (expand_inode_expression): Use inode_uid() and + inode_gid() macros when printing the uid/gid. + 2007-04-18 Theodore Tso <tytso@mit.edu> * e2fsck.conf.5.in (apply): Fix minor typo. diff --git a/e2fsck/message.c b/e2fsck/message.c index 23735d3c..5cf126cb 100644 --- a/e2fsck/message.c +++ b/e2fsck/message.c @@ -304,12 +304,10 @@ static _INLINE_ void expand_inode_expression(char ch, inode->i_dir_acl : 0)); break; case 'u': - printf("%d", (inode->i_uid | - (inode->osd2.linux2.l_i_uid_high << 16))); + printf("%d", inode_uid(*inode)); break; case 'g': - printf("%d", (inode->i_gid | - (inode->osd2.linux2.l_i_gid_high << 16))); + printf("%d", inode_gid(*inode)); break; case 't': if (LINUX_S_ISREG(inode->i_mode)) |