diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2000-02-02 16:19:59 +0000 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2000-02-02 16:19:59 +0000 |
| commit | 80e808fceb61c2061b32593c610893bf07a863ee (patch) | |
| tree | a06dadc93991b8fdfa81307f8a2f634f88a70e21 /debugfs | |
| parent | 73ae2d4a23f04e129cd08e29d9124620ad7b4300 (diff) | |
| download | e2fsprogs-80e808fceb61c2061b32593c610893bf07a863ee.tar.gz | |
ChangeLog, debugfs.c:
debugfs.c (dump_inode): Remove #ifdef for i_version vs. i_generation
since we know it will always be i_generation now.
ChangeLog, e2fsck.h, flushb.c, scantest.c:
e2fsck.h, flushb.c, scantest.c: Remove uneeded include of linux/fs.h
bmap.c:
Fix silly spelling typo.
ChangeLog, getsize.c, ismounted.c, swapfs.c:
getsize.c, ismounted.c: Remove unneeded include of linux/fs.h
swapfs.c: Remove #ifdef HAVE_EXT2_INODE_VERSION since it's not needed
any more; we know it will always be i_generation. Add support for
swapping the high bits of the uid and gid.
Diffstat (limited to 'debugfs')
| -rw-r--r-- | debugfs/ChangeLog | 6 | ||||
| -rw-r--r-- | debugfs/debugfs.c | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/debugfs/ChangeLog b/debugfs/ChangeLog index 051832cd..8026e87b 100644 --- a/debugfs/ChangeLog +++ b/debugfs/ChangeLog @@ -1,3 +1,9 @@ +2000-02-02 Theodore Ts'o <tytso@valinux.com> + + * debugfs.c (dump_inode): Remove #ifdef for i_version + vs. i_generation since we know it will always be + i_generation now. + 2000-01-18 Theodore Ts'o <tytso@valinux.com> * debugfs.c (main): Use return instead of exit at the end of main diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c index c4fd51cd..ad3abf93 100644 --- a/debugfs/debugfs.c +++ b/debugfs/debugfs.c @@ -359,13 +359,8 @@ static void dump_inode(ino_t inode_num, struct ext2_inode inode) else if (LINUX_S_ISSOCK(inode.i_mode)) i_type = "socket"; else i_type = "bad type"; fprintf(out, "Inode: %ld Type: %s ", inode_num, i_type); -#if defined(HAVE_EXT2_INODE_VERSION) - fprintf(out, "Mode: %04o Flags: 0x%x Version/Generation: %d\n", - inode.i_mode & 0777, inode.i_flags, inode.i_version); -#else - fprintf(out, "Mode: %04o Flags: 0x%x Version/Generation: %d\n", + fprintf(out, "Mode: %04o Flags: 0x%x Generation: %d\n", inode.i_mode & 0777, inode.i_flags, inode.i_generation); -#endif fprintf(out, "User: %5d Group: %5d Size: ", inode.i_uid, inode.i_gid); if (LINUX_S_ISDIR(inode.i_mode)) |