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.
diff --git a/debugfs/debugfs.c b/debugfs/debugfs.c
index c4fd51c..ad3abf9 100644
--- a/debugfs/debugfs.c
+++ b/debugfs/debugfs.c
@@ -359,13 +359,8 @@
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))