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

diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c
index d12ea28..2f04024 100644 (file)
--- a/fs/cramfs/inode.c
+++ b/fs/cramfs/inode.c
@@ -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);