Commit b8387f6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

fs/cramfs/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -958,8 +958,8 @@ static int cramfs_get_tree(struct fs_context *fc) 


	if (IS_ENABLED(CONFIG_CRAMFS_MTD)) {

		ret = get_tree_mtd(fc, cramfs_mtd_fill_super);

		if (ret < 0)

			return ret;

		if (!ret)

			return 0;

	}

	if (IS_ENABLED(CONFIG_CRAMFS_BLOCKDEV))

		ret = get_tree_bdev(fc, cramfs_blkdev_fill_super);