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/ChangeLog b/debugfs/ChangeLog
index 051832c..8026e87 100644 (file)
--- 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 c4fd51c..ad3abf9 100644 (file)
--- 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))

diff --git a/e2fsck/ChangeLog b/e2fsck/ChangeLog
index b52029d..d48ae4d 100644 (file)
--- a/e2fsck/ChangeLog
+++ b/e2fsck/ChangeLog
@@ -1,3 +1,8 @@
+2000-02-02  Theodore Ts'o  <tytso@valinux.com>
+
+       * e2fsck.h, flushb.c, scantest.c: Remove uneeded include of
+               linux/fs.h 
+
 2000-01-18  Theodore Ts'o  <tytso@valinux.com>
 
        * Makefile.in: Since LIBUUID can sometimes include "-lsocket"

diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index dd24d59..9ee43c8 100644 (file)
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -23,10 +23,6 @@
 #include <setjmp.h>
 #endif
 
-#ifdef HAVE_LINUX_FS_H
-#include <linux/fs.h>
-#endif
-
 #if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
 #include "ext2fs.h"

diff --git a/e2fsck/flushb.c b/e2fsck/flushb.c
index 20b9917..34ebe6d 100644 (file)
--- a/e2fsck/flushb.c
+++ b/e2fsck/flushb.c
@@ -9,10 +9,6 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#ifdef HAVE_LINUX_FS_H
-#include <linux/fs.h>
-#endif
-
 #ifdef __STDC__
 #define NOARGS void
 #else

diff --git a/e2fsck/scantest.c b/e2fsck/scantest.c
index f82e67f..1a37dc4 100644 (file)
--- a/e2fsck/scantest.c
+++ b/e2fsck/scantest.c
@@ -29,9 +29,6 @@
 #include <sys/types.h>
 #include <sys/time.h>
 
-#ifdef HAVE_LINUX_FS_H
-#include <linux/fs.h>
-#endif
 #include <linux/ext2_fs.h>
 
 #include "ext2fs/ext2fs.h"

diff --git a/lib/ext2fs/ChangeLog b/lib/ext2fs/ChangeLog
index e282a0a..6be53a5 100644 (file)
--- a/lib/ext2fs/ChangeLog
+++ b/lib/ext2fs/ChangeLog
@@ -1,3 +1,11 @@
+2000-02-02  Theodore Ts'o  <tytso@valinux.com>
+
+       * 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.
+
 1999-11-19    <tytso@valinux.com>
 
        * mkdir.c (ext2fs_mkdir): Only update the parent's inode link

diff --git a/lib/ext2fs/bmap.c b/lib/ext2fs/bmap.c
index ba3a114..9d7ebfe 100644 (file)
--- a/lib/ext2fs/bmap.c
+++ b/lib/ext2fs/bmap.c
@@ -1,5 +1,5 @@
 /*
- * bmap.c --- logical to phiscal block mapping
+ * bmap.c --- logical to physical block mapping
  *
  * Copyright (C) 1997 Theodore Ts'o.
  *

diff --git a/lib/ext2fs/getsize.c b/lib/ext2fs/getsize.c
index a7c6720..b92ce8d 100644 (file)
--- a/lib/ext2fs/getsize.c
+++ b/lib/ext2fs/getsize.c
@@ -17,9 +17,6 @@
 #include <errno.h>
 #endif
 #include <fcntl.h>
-#ifdef HAVE_LINUX_FS_H
-#include <linux/fs.h>
-#endif
 #ifdef HAVE_LINUX_FD_H
 #include <sys/ioctl.h>
 #include <linux/fd.h>

diff --git a/lib/ext2fs/ismounted.c b/lib/ext2fs/ismounted.c
index a65778e..fc66d48 100644 (file)
--- a/lib/ext2fs/ismounted.c
+++ b/lib/ext2fs/ismounted.c
@@ -17,9 +17,6 @@
 #include <errno.h>
 #endif
 #include <fcntl.h>
-#ifdef HAVE_LINUX_FS_H
-#include <linux/fs.h>
-#endif
 #ifdef HAVE_LINUX_FD_H
 #include <linux/fd.h>
 #endif

diff --git a/lib/ext2fs/swapfs.c b/lib/ext2fs/swapfs.c
index 66540b3..cf66270 100644 (file)
--- a/lib/ext2fs/swapfs.c
+++ b/lib/ext2fs/swapfs.c
@@ -100,11 +100,7 @@ void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
                for (i = 0; i < EXT2_N_BLOCKS; i++)
                        t->i_block[i] = f->i_block[i];
        }
-#if defined(HAVE_EXT2_INODE_VERSION)
-       t->i_version = ext2fs_swab32(f->i_version);
-#else
        t->i_generation = ext2fs_swab32(f->i_generation);
-#endif
        t->i_file_acl = ext2fs_swab32(f->i_file_acl);
        t->i_dir_acl = ext2fs_swab32(f->i_dir_acl);
        t->i_faddr = ext2fs_swab32(f->i_faddr);
@@ -116,10 +112,12 @@ void ext2fs_swap_inode(ext2_filsys fs, struct ext2_inode *t,
                t->osd2.linux2.l_i_frag = f->osd2.linux2.l_i_frag;
                t->osd2.linux2.l_i_fsize = f->osd2.linux2.l_i_fsize;
                t->osd2.linux2.i_pad1 = ext2fs_swab16(f->osd2.linux2.i_pad1);
-               t->osd2.linux2.l_i_reserved2[0] =
-                       ext2fs_swab32(f->osd2.linux2.l_i_reserved2[0]);
-               t->osd2.linux2.l_i_reserved2[1] =
-                       ext2fs_swab32(f->osd2.linux2.l_i_reserved2[1]);
+               t->osd2.linux2.l_i_uid_high =
+                 ext2fs_swab16 (f->osd2.linux2.l_i_uid_high);
+               t->osd2.linux2.l_i_gid_high =
+                 ext2fs_swab16 (f->osd2.linux2.l_i_gid_high);
+               t->osd2.linux2.l_i_reserved2 =
+                       ext2fs_swab32(f->osd2.linux2.l_i_reserved2);
                break;
        case EXT2_OS_HURD:
                t->osd1.hurd1.h_i_translator =