From patchwork Tue Jul 10 10:27:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gu Jinxiang X-Patchwork-Id: 10516813 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 605F66020F for ; Tue, 10 Jul 2018 10:27:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 501DB28D1F for ; Tue, 10 Jul 2018 10:27:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4459C28D2D; Tue, 10 Jul 2018 10:27:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C241728D1F for ; Tue, 10 Jul 2018 10:27:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751715AbeGJK1l (ORCPT ); Tue, 10 Jul 2018 06:27:41 -0400 Received: from mail.cn.fujitsu.com ([183.91.158.132]:3659 "EHLO heian.cn.fujitsu.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751332AbeGJK1k (ORCPT ); Tue, 10 Jul 2018 06:27:40 -0400 X-IronPort-AV: E=Sophos;i="5.43,368,1503331200"; d="scan'208";a="42061160" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 10 Jul 2018 18:27:36 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id A57AA4B473E2; Tue, 10 Jul 2018 18:27:34 +0800 (CST) Received: from localhost.localdomain (10.167.226.132) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.399.0; Tue, 10 Jul 2018 18:27:38 +0800 From: Gu Jinxiang To: CC: Subject: [PATCH 2/2] btrfs: get fs_devices pointer form btrfs_scan_one_device Date: Tue, 10 Jul 2018 18:27:22 +0800 Message-ID: <1531218442-12885-3-git-send-email-gujx@cn.fujitsu.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1531218442-12885-1-git-send-email-gujx@cn.fujitsu.com> References: <1531218442-12885-1-git-send-email-gujx@cn.fujitsu.com> MIME-Version: 1.0 X-Originating-IP: [10.167.226.132] X-yoursite-MailScanner-ID: A57AA4B473E2.A7415 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: gujx@cn.fujitsu.com Sender: linux-btrfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-btrfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Instead of pointer to btrfs_fs_devices as an arg in btrfs_scan_one_device, better to make it as a return value. Signed-off-by: Gu Jinxiang --- fs/btrfs/super.c | 29 ++++++++++++++++++----------- fs/btrfs/volumes.c | 14 +++++++------- fs/btrfs/volumes.h | 4 ++-- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 4ee082e96d51..a5ddeb6836e3 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c @@ -918,11 +918,13 @@ static int btrfs_parse_early_options(const char *options, fmode_t flags, error = -ENOMEM; goto out; } - error = btrfs_scan_one_device(device_name, - flags, holder, &fs_devices); + fs_devices = btrfs_scan_one_device(device_name, + flags, holder); kfree(device_name); - if (error) + if (IS_ERR(fs_devices)) { + error = PTR_ERR(fs_devices); goto out; + } } } @@ -1539,9 +1541,11 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, return ERR_PTR(error); } - error = btrfs_scan_one_device(device_name, mode, fs_type, &fs_devices); - if (error) + fs_devices = btrfs_scan_one_device(device_name, mode, fs_type); + if (IS_ERR(fs_devices)) { + error = PTR_ERR(fs_devices); goto error_sec_opts; + } /* * Setup a dummy root and fs_info for test/set super. This is because @@ -2222,7 +2226,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { struct btrfs_ioctl_vol_args *vol; - struct btrfs_fs_devices *fs_devices; + struct btrfs_fs_devices *fs_devices = NULL; int ret = -ENOTTY; if (!capable(CAP_SYS_ADMIN)) @@ -2234,14 +2238,17 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd, switch (cmd) { case BTRFS_IOC_SCAN_DEV: - ret = btrfs_scan_one_device(vol->name, FMODE_READ, - &btrfs_root_fs_type, &fs_devices); + fs_devices = btrfs_scan_one_device(vol->name, FMODE_READ, + &btrfs_root_fs_type); + ret = IS_ERR(fs_devices) ? PTR_ERR(fs_devices) : 0; break; case BTRFS_IOC_DEVICES_READY: - ret = btrfs_scan_one_device(vol->name, FMODE_READ, - &btrfs_root_fs_type, &fs_devices); - if (ret) + fs_devices = btrfs_scan_one_device(vol->name, FMODE_READ, + &btrfs_root_fs_type); + if (IS_ERR(fs_devices)) { + ret = PTR_ERR(fs_devices); break; + } ret = !(fs_devices->num_devices == fs_devices->total_devices); break; case BTRFS_IOC_GET_SUPPORTED_FEATURES: diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index b33bf29130b6..ea1ca4da413d 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -1215,14 +1215,14 @@ static int btrfs_read_disk_super(struct block_device *bdev, u64 bytenr, * and we are not allowed to call set_blocksize during the scan. The superblock * is read via pagecache */ -int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, - struct btrfs_fs_devices **fs_devices_ret) +struct btrfs_fs_devices *btrfs_scan_one_device(const char *path, fmode_t flags, + void *holder) { struct btrfs_super_block *disk_super; struct btrfs_device *device; struct block_device *bdev; struct page *page; - int ret = 0; + struct btrfs_fs_devices *ret = NULL; u64 bytenr; /* @@ -1236,19 +1236,19 @@ int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, bdev = blkdev_get_by_path(path, flags, holder); if (IS_ERR(bdev)) - return PTR_ERR(bdev); + return ERR_CAST(bdev); if (btrfs_read_disk_super(bdev, bytenr, &page, &disk_super)) { - ret = -EINVAL; + ret = ERR_PTR(-EINVAL); goto error_bdev_put; } mutex_lock(&uuid_mutex); device = device_list_add(path, disk_super); if (IS_ERR(device)) - ret = PTR_ERR(device); + ret = ERR_CAST(device); else - *fs_devices_ret = device->fs_devices; + ret = device->fs_devices; mutex_unlock(&uuid_mutex); btrfs_release_disk_super(page); diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 77e6004b6cb9..f867f07be963 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h @@ -406,8 +406,8 @@ blk_status_t btrfs_map_bio(struct btrfs_fs_info *fs_info, struct bio *bio, int mirror_num, int async_submit); int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, fmode_t flags, void *holder); -int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, - struct btrfs_fs_devices **fs_devices_ret); +struct btrfs_fs_devices *btrfs_scan_one_device(const char *path, fmode_t flags, + void *holder); int btrfs_close_devices(struct btrfs_fs_devices *fs_devices); void btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices, int step); void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,