Commit b8387f6f authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

Pull cramfs fix from Al Viro:
 "Regression fix, fallen through the cracks"

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  cramfs: fix usage on non-MTD device
parents 6b8a7946 3e5aeec0
...@@ -958,8 +958,8 @@ static int cramfs_get_tree(struct fs_context *fc) ...@@ -958,8 +958,8 @@ static int cramfs_get_tree(struct fs_context *fc)
if (IS_ENABLED(CONFIG_CRAMFS_MTD)) { if (IS_ENABLED(CONFIG_CRAMFS_MTD)) {
ret = get_tree_mtd(fc, cramfs_mtd_fill_super); ret = get_tree_mtd(fc, cramfs_mtd_fill_super);
if (ret < 0) if (!ret)
return ret; return 0;
} }
if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV)) if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV))
ret = get_tree_bdev(fc, cramfs_blkdev_fill_super); ret = get_tree_bdev(fc, cramfs_blkdev_fill_super);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment