From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from aserp2120.oracle.com ([141.146.126.78]:57216 "EHLO aserp2120.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182AbeC3AQe (ORCPT ); Thu, 29 Mar 2018 20:16:34 -0400 Received: from pps.filterd (aserp2120.oracle.com [127.0.0.1]) by aserp2120.oracle.com (8.16.0.22/8.16.0.22) with SMTP id w2U04Lkb007742 for ; Fri, 30 Mar 2018 00:16:34 GMT Received: from aserv0022.oracle.com (aserv0022.oracle.com [141.146.126.234]) by aserp2120.oracle.com with ESMTP id 2h1abwr17m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 30 Mar 2018 00:16:33 +0000 Received: from aserv0122.oracle.com (aserv0122.oracle.com [141.146.126.236]) by aserv0022.oracle.com (8.14.4/8.14.4) with ESMTP id w2U07dZI001745 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Fri, 30 Mar 2018 00:07:39 GMT Received: from abhmp0016.oracle.com (abhmp0016.oracle.com [141.146.116.22]) by aserv0122.oracle.com (8.14.4/8.14.4) with ESMTP id w2U07dOM018388 for ; Fri, 30 Mar 2018 00:07:39 GMT From: Anand Jain To: linux-btrfs@vger.kernel.org Subject: [PATCH v2 3/7] btrfs: cleanup btrfs_read_disk_super() to return std error Date: Fri, 30 Mar 2018 08:09:19 +0800 Message-Id: <20180330000924.11148-4-anand.jain@oracle.com> In-Reply-To: <20180330000924.11148-1-anand.jain@oracle.com> References: <20180330000924.11148-1-anand.jain@oracle.com> Sender: linux-btrfs-owner@vger.kernel.org List-ID: 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 Reviewed-by: Nikolay Borisov --- 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