From 990d4296706c911f7d29667d147104b8f0ac9f34 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Sun, 14 Jan 2001 17:56:00 +0000 Subject: [PATCH] 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. --- include/linux/ChangeLog | 5 +++++ include/linux/ext2_fs.h | 1 + lib/e2p/ChangeLog | 5 +++++ lib/e2p/feature.c | 41 ----------------------------------------- 4 files changed, 11 insertions(+), 41 deletions(-) diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog index a65cd20..200918f 100644 --- a/include/linux/ChangeLog +++ b/include/linux/ChangeLog @@ -1,3 +1,8 @@ +2001-01-14 Theodore Ts'o + + * ext2_fs.h (EXT3_FEATURE_INCOMPAT_JOURNAL_DEV): Add definition + for use with external journal devices. + 2001-01-05 * 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 be66a3c..33a5052 100644 --- 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 e9e1c9e..3d37056 100644 --- a/lib/e2p/ChangeLog +++ b/lib/e2p/ChangeLog @@ -1,3 +1,8 @@ +2001-01-14 Theodore Ts'o + + * feature.c: Remove backward compatibility #ifdef's for old + ext2_fs.h header files. + 2001-01-11 Theodore Ts'o * pf.c: Clarified name of the Compression_Raw_Access flag, and diff --git a/lib/e2p/feature.c b/lib/e2p/feature.c index 327c8d4..e5b29e6 100644 --- 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; -- 1.8.3.1