Attachment 164769 Details for Bug 205668 – Patch to add support for the EXT2F_INCOMPAT_RECOVER flag

[patch] Patch to add support for the EXT2F_INCOMPAT_RECOVER flag

ext4fs-recover-flag.patch (text/plain), 2.02 KB, created by Damjan Jovanovic on 2015-12-28 16:06:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Damjan Jovanovic

Created: 2015-12-28 16:06:01 UTC

Size: 2.02 KB

patch

obsolete

>diff --git a/sys/fs/ext2fs/ext2_vfsops.c b/sys/fs/ext2fs/ext2_vfsops.c
>index ce943ea..7bff12d 100644
>--- a/sys/fs/ext2fs/ext2_vfsops.c
>+++ b/sys/fs/ext2fs/ext2_vfsops.c
>@@ -196,7 +196,8 @@ ext2_mount(struct mount *mp)
> 				return (error);
> 
> 			if ((fs->e2fs->e2fs_state & E2FS_ISCLEAN) == 0 ||
>-			    (fs->e2fs->e2fs_state & E2FS_ERRORS)) {
>+			    (fs->e2fs->e2fs_state & E2FS_ERRORS) ||
>+			    (fs->e2fs->e2fs_features_incompat & EXT2F_INCOMPAT_RECOVER)) {
> 				if (mp->mnt_flag & MNT_FORCE) {
> 					printf(
> "WARNING: %s was not properly dismounted\n", fs->e2fs_fsmnt);
>@@ -571,7 +572,8 @@ ext2_mountfs(struct vnode *devvp, struct mount *mp)
> 		goto out;
> 	}
> 	if ((es->e2fs_state & E2FS_ISCLEAN) == 0 ||
>-	    (es->e2fs_state & E2FS_ERRORS)) {
>+	    (es->e2fs_state & E2FS_ERRORS) ||
>+	    (es->e2fs_features_incompat & EXT2F_INCOMPAT_RECOVER)) {
> 		if (ronly || (mp->mnt_flag & MNT_FORCE)) {
> 			printf(
> "WARNING: Filesystem was not properly dismounted\n");
>diff --git a/sys/fs/ext2fs/ext2fs.h b/sys/fs/ext2fs/ext2fs.h
>index 9985c45..ce96112 100644
>--- a/sys/fs/ext2fs/ext2fs.h
>+++ b/sys/fs/ext2fs/ext2fs.h
>@@ -187,6 +187,7 @@ struct csum {
> 
> #define	EXT2F_INCOMPAT_COMP		0x0001
> #define	EXT2F_INCOMPAT_FTYPE		0x0002
>+#define	EXT2F_INCOMPAT_RECOVER		0x0004
> #define	EXT2F_INCOMPAT_META_BG		0x0010
> #define	EXT2F_INCOMPAT_EXTENTS		0x0040
> #define	EXT2F_INCOMPAT_64BIT		0x0080
>@@ -201,6 +202,7 @@ struct csum {
>  * - EXT2F_ROCOMPAT_LARGEFILE
>  * - EXT2F_ROCOMPAT_EXTRA_ISIZE
>  * - EXT2F_INCOMPAT_FTYPE
>+ * - EXT2F_INCOMPAT_RECOVER
>  *
>  * We partially support (read-only) the following EXT4 features:
>  * - EXT2F_ROCOMPAT_HUGE_FILE
>@@ -214,7 +216,8 @@ struct csum {
> #define	EXT2F_ROCOMPAT_SUPP		(EXT2F_ROCOMPAT_SPARSESUPER | \
> 					 EXT2F_ROCOMPAT_LARGEFILE | \
> 					 EXT2F_ROCOMPAT_EXTRA_ISIZE)
>-#define	EXT2F_INCOMPAT_SUPP		EXT2F_INCOMPAT_FTYPE
>+#define	EXT2F_INCOMPAT_SUPP		(EXT2F_INCOMPAT_FTYPE | \
>+					 EXT2F_INCOMPAT_RECOVER)
> #define	EXT4F_RO_INCOMPAT_SUPP		(EXT2F_INCOMPAT_EXTENTS | \
> 					 EXT2F_INCOMPAT_FLEX_BG | \
> 					 EXT2F_INCOMPAT_META_BG )

Actions: View | Diff

Attachments on bug 205668: 164769 | 164776