Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'maint'
[tools/e2fsprogs.git]
/
lib
/
ext2fs
/
openfs.c
diff --git
a/lib/ext2fs/openfs.c
b/lib/ext2fs/openfs.c
index
cb683ee
..
a6a8217
100644
(file)
--- a/
lib/ext2fs/openfs.c
+++ b/
lib/ext2fs/openfs.c
@@
-303,10
+303,14
@@
errcode_t ext2fs_open2(const char *name, const char *io_options,
fs->stride = fs->super->s_raid_stride;
+ fs->flags &= ~EXT2_FLAG_NOFREE_ON_ERROR;
*ret_fs = fs;
return 0;
cleanup:
- ext2fs_free(fs);
+ if (flags & EXT2_FLAG_NOFREE_ON_ERROR)
+ *ret_fs = fs;
+ else
+ ext2fs_free(fs);
return retval;
}