patch-pre2.0.14-final2.0 linux/fs/ext2/super.c

• Lines: 26
• Date: Fri Jun 7 15:45:21 1996
• Orig file: pre2.0.14/linux/fs/ext2/super.c
• Orig date: Sun May 5 08:52:03 1996

diff -u --recursive --new-file pre2.0.14/linux/fs/ext2/super.c linux/fs/ext2/super.c
@@ -411,11 +411,20 @@
 		MOD_DEC_USE_COUNT;
 		return NULL;
 	}
-	if ((es->s_rev_level > EXT2_GOOD_OLD_REV) &&
-	    (es->s_feature_incompat & !EXT2_FEATURE_INCOMPAT_SUPP)) {
-		printk("EXT2-fs: %s: couldn't mount because of "
-		       "unsupported optional features.\n", kdevname(dev));
-		goto failed_mount;
+	if (es->s_rev_level > EXT2_GOOD_OLD_REV) {
+		if (es->s_feature_incompat & ~EXT2_FEATURE_INCOMPAT_SUPP) {
+			printk("EXT2-fs: %s: couldn't mount because of "
+			       "unsupported optional features.\n", 
+			       kdevname(dev));
+			goto failed_mount;
+		}
+		if (!(sb->s_flags & MS_RDONLY) &&
+		    (es->s_feature_ro_compat & ~EXT2_FEATURE_RO_COMPAT_SUPP)) {
+			printk("EXT2-fs: %s: couldn't mount RDWR because of "
+			       "unsupported optional features.\n", 
+			       kdevname(dev));
+			goto failed_mount;
+		}
 	}
 	sb->s_blocksize_bits = sb->u.ext2_sb.s_es->s_log_block_size + 10;
 	sb->s_blocksize = 1 << sb->s_blocksize_bits;