ChangeLog, feature.c:

  feature.c: Remove backward compatibility #ifdef's for old ext2_fs.h
  	header files.
.del-ext2_fs.h~7a460879, ChangeLog:
  ext2_fs.h (EXT3_FEATURE_INCOMPAT_JOURNAL_DEV): Add definition for use
  	with external journal devices.

diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index a65cd20f543e33661490d507d0b094d538bb86cd..200918fe2931525a708ebc1fd6549213047050f8 100644 (file)
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-14  Theodore Ts'o  <tytso@valinux.com>
+
+       * ext2_fs.h (EXT3_FEATURE_INCOMPAT_JOURNAL_DEV): Add definition
+               for use with external journal devices.
+
 2001-01-05    <tytso@snap.thunk.org>
 
        * jfs.h: Move prototypes outside of the KERNEL #ifdef.  Remove

diff --git a/include/linux/ext2_fs.h b/include/linux/ext2_fs.h
index be66a3c076e7555ccbe64b7b4bd76854c68ac008..33a505295c4fa37692f6622a4f8ecdc36e0489a9 100644 (file)
--- a/include/linux/ext2_fs.h
+++ b/include/linux/ext2_fs.h
@@ -451,6 +451,7 @@ struct ext2_super_block {
 #define EXT2_FEATURE_INCOMPAT_COMPRESSION      0x0001
 #define EXT2_FEATURE_INCOMPAT_FILETYPE         0x0002
 #define EXT3_FEATURE_INCOMPAT_RECOVER          0x0004 /* Needs recovery */
+#define EXT3_FEATURE_INCOMPAT_JOURNAL_DEV      0x0008 /* Journal device */
 
 #define EXT2_FEATURE_COMPAT_SUPP       0
 #define EXT2_FEATURE_INCOMPAT_SUPP     EXT2_FEATURE_INCOMPAT_FILETYPE

diff --git a/lib/e2p/ChangeLog b/lib/e2p/ChangeLog
index e9e1c9e42a495af13ce3bffd11f385e7a823aad3..3d37056e1cc28336b2a60416856658f7a7ecdcd9 100644 (file)
--- a/lib/e2p/ChangeLog
+++ b/lib/e2p/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-14  Theodore Ts'o  <tytso@valinux.com>
+
+       * feature.c: Remove backward compatibility #ifdef's for old
+               ext2_fs.h header files.
+
 2001-01-11  Theodore Ts'o  <tytso@valinux.com>
 
        * pf.c: Clarified name of the Compression_Raw_Access flag, and

diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c
index 327c8d4593d6d7b5b328d6546956b59af9c139c7..e5b29e6c06a769a640afea16e02ef949789480cb 100644 (file)
--- a/lib/e2p/feature.c
+++ b/lib/e2p/feature.c
@@ -16,47 +16,6 @@
 
 #include "e2p.h"
 
-/*
- * Feature set definitions (that might not be in ext2_fs.h
- */
-
-#ifndef EXT2_FEATURE_COMPAT_DIR_PREALLOC
-#define EXT2_FEATURE_COMPAT_DIR_PREALLOC       0x0001
-#endif
-
-#ifndef EXT2_FEATURE_COMPAT_IMAGIC_INODES /* for AFS, etc. */
-#define EXT2_FEATURE_COMPAT_IMAGIC_INODES              0x0002
-#endif
-
-#ifndef EXT3_FEATURE_COMPAT_HAS_JOURNAL
-#define EXT3_FEATURE_COMPAT_HAS_JOURNAL                0x0004
-#endif
-
-#ifndef EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER
-#define EXT2_FEATURE_RO_COMPAT_SPARSE_SUPER    0x0001
-#endif
-
-#ifndef EXT2_FEATURE_RO_COMPAT_LARGE_FILE
-#define EXT2_FEATURE_RO_COMPAT_LARGE_FILE      0x0002
-#define i_size_high i_dir_acl
-#endif
-
-#ifndef EXT2_FEATURE_RO_COMPAT_BTREE_DIR
-#define EXT2_FEATURE_RO_COMPAT_BTREE_DIR       0x0004
-#endif
-
-#ifndef EXT2_FEATURE_INCOMPAT_COMPRESSION
-#define EXT2_FEATURE_INCOMPAT_COMPRESSION      0x0001
-#endif
-
-#ifndef EXT2_FEATURE_INCOMPAT_FILETYPE
-#define EXT2_FEATURE_INCOMPAT_FILETYPE 0x0002
-#endif
-
-#ifndef EXT3_FEATURE_INCOMPAT_RECOVER
-#define EXT3_FEATURE_INCOMPAT_RECOVER  0x0004
-#endif
-
 struct feature {
        int             compat;
        unsigned int    mask;