aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTheodore Ts'o <tytso@mit.edu>2013-01-08 20:47:11 -0500
committerTheodore Ts'o <tytso@mit.edu>2013-01-08 20:47:11 -0500
commitf0257d8891c602cabc7358a5ca826444a172ccf5 (patch)
treebe57fa83b48cb36b327b2597e71ff11d4b26162b
parenta046da5963649663933cf16d54ca2a892cc1a560 (diff)
downloade2fsprogs-f0257d8891c602cabc7358a5ca826444a172ccf5.tar.gz
e2fsprogs-f0257d8891c602cabc7358a5ca826444a172ccf5.tar.xz
e2fsprogs-f0257d8891c602cabc7358a5ca826444a172ccf5.zip
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" <tytso@mit.edu>
-rw-r--r--lib/ext2fs/openfs.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ext2fs/openfs.c b/lib/ext2fs/openfs.c
index d483bd95..113b80e7 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)