diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-24 21:36:39 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-11-24 21:36:39 +0100 |
| commit | b8387f6f34952c09fe9a9f6e4be027f8b16cfd18 (patch) | |
| tree | 25ee2094077f95e027bd43898d2e2a527df1d465 | |
| parent | Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost (diff) | |
| parent | cramfs: fix usage on non-MTD device (diff) | |
| download | linux-b8387f6f34952c09fe9a9f6e4be027f8b16cfd18.tar.xz linux-b8387f6f34952c09fe9a9f6e4be027f8b16cfd18.zip | |
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
| -rw-r--r-- | fs/cramfs/inode.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/cramfs/inode.c b/fs/cramfs/inode.c index d12ea28836a5..2f04024c3588 100644 --- 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); |