Skip to content

Commit b8387f6

Browse files
committed
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
2 parents 6b8a794 + 3e5aeec commit b8387f6

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

fs/cramfs/inode.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -958,8 +958,8 @@ static int cramfs_get_tree(struct fs_context *fc)
958958

959959
if (IS_ENABLED(CONFIG_CRAMFS_MTD)) {
960960
ret = get_tree_mtd(fc, cramfs_mtd_fill_super);
961-
if (ret < 0)
962-
return ret;
961+
if (!ret)
962+
return 0;
963963
}
964964
if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV))
965965
ret = get_tree_bdev(fc, cramfs_blkdev_fill_super);

0 commit comments

Comments
 (0)