|
 |
252946 |
Index: e2fsprogs-1.41.5/e2fsck/super.c
|
|
|
252946 |
===================================================================
|
|
|
252946 |
--- e2fsprogs-1.41.5.orig/e2fsck/super.c
|
|
|
252946 |
+++ e2fsprogs-1.41.5/e2fsck/super.c
|
|
|
252946 |
@@ -869,7 +869,11 @@ void check_super_block(e2fsck_t ctx)
|
|
|
252946 |
* unfortunately, we shouldn't ignore it since if it's not set in the
|
|
|
252946 |
* backup, the extended attributes in the filesystem will be stripped
|
|
|
252946 |
* away.
|
|
|
252946 |
+ *
|
|
|
252946 |
+ * Well, I'm still going that route for now, 'til I do something
|
|
|
252946 |
+ * better. Full-fsck after a fresh install is just no good. -ERS
|
|
|
252946 |
*/
|
|
|
252946 |
+#define FEATURE_COMPAT_IGNORE (EXT2_FEATURE_COMPAT_EXT_ATTR)
|
|
|
252946 |
#define FEATURE_RO_COMPAT_IGNORE (EXT2_FEATURE_RO_COMPAT_LARGE_FILE| \
|
|
|
252946 |
EXT4_FEATURE_RO_COMPAT_DIR_NLINK)
|
|
|
252946 |
#define FEATURE_INCOMPAT_IGNORE (EXT3_FEATURE_INCOMPAT_EXTENTS| \
|
|
|
252946 |
@@ -921,6 +925,9 @@ int check_backup_super_block(e2fsck_t ct
|
|
|
252946 |
(EXT2_INODE_SIZE(backup_sb) < EXT2_GOOD_OLD_INODE_SIZE))
|
|
|
252946 |
continue;
|
|
|
252946 |
|
|
|
252946 |
+#define SUPER_COMPAT_DIFFERENT(x) \
|
|
|
252946 |
+ ((fs->super->x & ~FEATURE_COMPAT_IGNORE) != \
|
|
|
252946 |
+ (backup_sb->x & ~FEATURE_COMPAT_IGNORE))
|
|
|
252946 |
#define SUPER_INCOMPAT_DIFFERENT(x) \
|
|
|
252946 |
((fs->super->x & ~FEATURE_INCOMPAT_IGNORE) != \
|
|
|
252946 |
(backup_sb->x & ~FEATURE_INCOMPAT_IGNORE))
|
|
|
252946 |
@@ -930,7 +937,7 @@ int check_backup_super_block(e2fsck_t ct
|
|
|
252946 |
#define SUPER_DIFFERENT(x) \
|
|
|
252946 |
(fs->super->x != backup_sb->x)
|
|
|
252946 |
|
|
|
252946 |
- if (SUPER_DIFFERENT(s_feature_compat) ||
|
|
|
252946 |
+ if (SUPER_COMPAT_DIFFERENT(s_feature_compat) ||
|
|
|
252946 |
SUPER_INCOMPAT_DIFFERENT(s_feature_incompat) ||
|
|
|
252946 |
SUPER_RO_COMPAT_DIFFERENT(s_feature_ro_compat) ||
|
|
|
252946 |
SUPER_DIFFERENT(s_blocks_count) ||
|