Fix btrfs_fill_super to return -EINVAL when no FS found

Signed-off-by: Chris Mason <chris.mason@oracle.com>

3 files changed, 4 insertions, 5 deletions

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 709e33d08bb5..5547607681f4 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -728,9 +728,8 @@ struct btrfs_root *open_ctree(struct super_block *sb,
         struct btrfs_root *dev_root = kmalloc(sizeof(struct btrfs_root),
                                               GFP_NOFS);
         int ret;
-        int err = -EIO;
+        int err = -EINVAL;
         struct btrfs_super_block *disk_super;
-
         if (!extent_root || !tree_root || !fs_info) {
                 err = -ENOMEM;
                 goto fail;
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c
index 9624923a33dc..892864906880 100644
--- a/fs/btrfs/super.c
+++ b/fs/btrfs/super.c
@@ -236,9 +236,9 @@ static int btrfs_fill_super(struct super_block * sb,
 
         tree_root = open_ctree(sb, fs_devices);
 
-        if (!tree_root || IS_ERR(tree_root)) {
+        if (IS_ERR(tree_root)) {
                 printk("btrfs: open_ctree failed\n");
-                return -EIO;
+                return PTR_ERR(tree_root);
         }
         sb->s_fs_info = tree_root;
         disk_super = &tree_root->fs_info->super_copy;
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index d8fce32a3bbc..169be0f7285b 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -237,7 +237,7 @@ int btrfs_scan_one_device(const char *path, int flags, void *holder,
         if (strncmp((char *)(&disk_super->magic), BTRFS_MAGIC,
             sizeof(disk_super->magic))) {
                 printk("no btrfs found on %s\n", path);
-                ret = -ENOENT;
+                ret = -EINVAL;
                 goto error_brelse;
         }
         devid = le64_to_cpu(disk_super->dev_item.devid);