From f0257d8891c602cabc7358a5ca826444a172ccf5 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Tue, 8 Jan 2013 20:47:11 -0500 Subject: [PATCH] libext2fs: ext2fs_open2() should not set ret_fs after a MMP failure The addition of MMP code was added in the wrong place, so ret_fs could get set (and EXT2_FLAG_NOFREE_ON_ERROR was cleared as well, which could confuse e2fsck which depends on this flag being cleared if ext2fs_open2() succeeded.) Signed-off-by: "Theodore Ts'o" --- lib/ext2fs/openfs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c index d483bd9..113b80e 100644 --- a/lib/ext2fs/openfs.c +++ b/lib/ext2fs/openfs.c @@ -391,9 +391,6 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, ext2fs_mark_super_dirty(fs); } - fs->flags &= ~EXT2_FLAG_NOFREE_ON_ERROR; - *ret_fs = fs; - if ((fs->super->s_feature_incompat & EXT4_FEATURE_INCOMPAT_MMP) && !(flags & EXT2_FLAG_SKIP_MMP) && (flags & (EXT2_FLAG_RW | EXT2_FLAG_EXCLUSIVE))) { @@ -405,6 +402,9 @@ errcode_t ext2fs_open2(const char *name, const char *io_options, } } + fs->flags &= ~EXT2_FLAG_NOFREE_ON_ERROR; + *ret_fs = fs; + return 0; cleanup: if (flags & EXT2_FLAG_NOFREE_ON_ERROR) -- 1.8.3.1