d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext2fs: remove EXT4F_RO_INCOMPAT_SUPP

Browse Source 
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
This commit is contained in:
pfg 2018-02-05 15:14:01 +00:00
parent 0737f6313e
commit 578257632e
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sys/fs/ext2fs/ext2_vfsops.c
View File

@ -290,8 +290,7 @@ ext2_check_sb_compat(struct ext2fs *es, struct cdev *dev, int ronly)
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));

6
sys/fs/ext2fs/ext2fs.h
View File

@ -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