Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 5 Feb 2018 15:14:01 +0000 (UTC)
From:      "Pedro F. Giffuni" <pfg@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r328885 - head/sys/fs/ext2fs
Message-ID:  <201802051514.w15FE1IW095074@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pfg
Date: Mon Feb  5 15:14:01 2018
New Revision: 328885
URL: https://svnweb.freebsd.org/changeset/base/328885

Log:
  ext2fs: remove EXT4F_RO_INCOMPAT_SUPP
  
  This was a hack to be able to mount ext4 filesystems read-only while not
  supporting all the features. We now support all those features so it
  doesn't make sense to keep the undocumented hack.
  
  Discussed with:	fsu

Modified:
  head/sys/fs/ext2fs/ext2_vfsops.c
  head/sys/fs/ext2fs/ext2fs.h

Modified: head/sys/fs/ext2fs/ext2_vfsops.c
==============================================================================
--- head/sys/fs/ext2fs/ext2_vfsops.c	Mon Feb  5 15:02:35 2018	(r328884)
+++ head/sys/fs/ext2fs/ext2_vfsops.c	Mon Feb  5 15:14:01 2018	(r328885)
@@ -290,8 +290,7 @@ ext2_check_sb_compat(struct ext2fs *es, struct cdev *d
 		return (1);
 	}
 	if (es->e2fs_rev > E2FS_REV0) {
-		mask = es->e2fs_features_incompat & ~(EXT2F_INCOMPAT_SUPP |
-		    EXT4F_RO_INCOMPAT_SUPP);
+		mask = es->e2fs_features_incompat & ~(EXT2F_INCOMPAT_SUPP);
 		if (mask) {
 			printf("WARNING: mount of %s denied due to "
 			    "unsupported optional features:\n", devtoname(dev));

Modified: head/sys/fs/ext2fs/ext2fs.h
==============================================================================
--- head/sys/fs/ext2fs/ext2fs.h	Mon Feb  5 15:02:35 2018	(r328884)
+++ head/sys/fs/ext2fs/ext2fs.h	Mon Feb  5 15:14:01 2018	(r328885)
@@ -319,11 +319,6 @@ static const struct ext2_feature incompat[] = {
  * - EXT2F_ROCOMPAT_HUGE_FILE
  * - EXT2F_INCOMPAT_EXTENTS
  *
- * We do not support these EXT4 features but they are irrelevant
- * for read-only support:
- * - EXT2F_INCOMPAT_RECOVER
- * - EXT2F_INCOMPAT_FLEX_BG
- * - EXT2F_INCOMPAT_META_BG
  */
 #define	EXT2F_COMPAT_SUPP		EXT2F_COMPAT_DIRHASHINDEX
 #define	EXT2F_ROCOMPAT_SUPP		(EXT2F_ROCOMPAT_SPARSESUPER | \
@@ -339,7 +334,6 @@ static const struct ext2_feature incompat[] = {
 					 EXT2F_INCOMPAT_64BIT | \
 					 EXT2F_INCOMPAT_FLEX_BG | \
 					 EXT2F_INCOMPAT_CSUM_SEED)
-#define	EXT4F_RO_INCOMPAT_SUPP		EXT2F_INCOMPAT_RECOVER
 
 /* Assume that user mode programs are passing in an ext2fs superblock, not
  * a kernel struct super_block.  This will allow us to call the feature-test



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201802051514.w15FE1IW095074>