[PATCH v2 3/8] btrfs: cleanup btrfs_read_disk_super() to return std error

[Anand Jain]

The only caller btrfs_scan_one_device() sets -EINVAL for error from
btrfs_read_disk_super(), so this patch returns -EINVAL from the latter
function.

A preparatory patch to add csum check in btrfs_read_disk_super().

Signed-off-by: Anand Jain <anand.j...@oracle.com>
---
v1->v2:
 Check btrfs_read_disk_super() to be more explicit ret < 0

 fs/btrfs/volumes.c | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 87d183accdb2..e63723f23227 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1154,23 +1154,23 @@ static int btrfs_read_disk_super(struct block_device 
*bdev, u64 bytenr,
 
        /* make sure our super fits in the device */
        if (bytenr + PAGE_SIZE >= i_size_read(bdev->bd_inode))
-               return 1;
+               return -EINVAL;
 
        /* make sure our super fits in the page */
        if (sizeof(**disk_super) > PAGE_SIZE)
-               return 1;
+               return -EINVAL;
 
        /* make sure our super doesn't straddle pages on disk */
        index = bytenr >> PAGE_SHIFT;
        if ((bytenr + sizeof(**disk_super) - 1) >> PAGE_SHIFT != index)
-               return 1;
+               return -EINVAL;
 
        /* pull in the page with our super */
        *page = read_cache_page_gfp(bdev->bd_inode->i_mapping,
                                   index, GFP_KERNEL);
 
        if (IS_ERR_OR_NULL(*page))
-               return 1;
+               return -EINVAL;
 
        p = kmap(*page);
 
@@ -1180,7 +1180,7 @@ static int btrfs_read_disk_super(struct block_device 
*bdev, u64 bytenr,
        if (btrfs_super_bytenr(*disk_super) != bytenr ||
            btrfs_super_magic(*disk_super) != BTRFS_MAGIC) {
                btrfs_release_disk_super(*page);
-               return 1;
+               return -EINVAL;
        }
 
        if ((*disk_super)->label[0] &&
@@ -1218,10 +1218,9 @@ int btrfs_scan_one_device(const char *path, fmode_t 
flags, void *holder,
        if (IS_ERR(bdev))
                return PTR_ERR(bdev);
 
-       if (btrfs_read_disk_super(bdev, bytenr, &page, &disk_super)) {
-               ret = -EINVAL;
+       ret = btrfs_read_disk_super(bdev, bytenr, &page, &disk_super);
+       if (ret < 0)
                goto error_bdev_put;
-       }
 
        mutex_lock(&uuid_mutex);
        device = device_list_add(path, disk_super);
-- 
2.7.0

--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html