From: Anand Jain <anand.jain@oracle.com>
To: Nikolay Borisov <nborisov@suse.com>, linux-btrfs@vger.kernel.org
Subject: Re: [PATCH 3/5] btrfs: Make close_fs_devices return void
Date: Sat, 29 Aug 2020 23:14:50 +0800 [thread overview]
Message-ID: <a09845f6-b790-14c0-01f6-7cde8f4c29f6@oracle.com> (raw)
In-Reply-To: <20200715104850.19071-4-nborisov@suse.com>
On 15/7/20 6:48 pm, Nikolay Borisov wrote:
> The return value of this function conveys absolutely no information.
> All callers already check the state of fs_devices->opened to decide
> how to proceed. So conver the function to returning void. While at it
> make btrfs_close_devices also return void.
>
> Signed-off-by: Nikolay Borisov <nborisov@suse.com>
> ---
> fs/btrfs/volumes.c | 12 ++++--------
> fs/btrfs/volumes.h | 2 +-
> 2 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index db29fc4fbe89..6de021c78277 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -1146,12 +1146,12 @@ static void btrfs_close_one_device(struct btrfs_device *device)
> ASSERT(atomic_read(&device->reada_in_flight) == 0);
> }
>
> -static int close_fs_devices(struct btrfs_fs_devices *fs_devices)
> +static void close_fs_devices(struct btrfs_fs_devices *fs_devices)
> {
> struct btrfs_device *device, *tmp;
>
> if (--fs_devices->opened > 0)
> - return 0;
> + return;
>
> mutex_lock(&fs_devices->device_list_mutex);
> list_for_each_entry_safe(device, tmp, &fs_devices->devices, dev_list) {
> @@ -1163,17 +1163,14 @@ static int close_fs_devices(struct btrfs_fs_devices *fs_devices)
> WARN_ON(fs_devices->rw_devices);
> fs_devices->opened = 0;
> fs_devices->seeding = false;
> -
> - return 0;
> }
>
> -int btrfs_close_devices(struct btrfs_fs_devices *fs_devices)
> +void btrfs_close_devices(struct btrfs_fs_devices *fs_devices)
> {
> struct btrfs_fs_devices *seed_devices = NULL;
> - int ret;
>
> mutex_lock(&uuid_mutex);
> - ret = close_fs_devices(fs_devices);
> + close_fs_devices(fs_devices);
> if (!fs_devices->opened) {
> seed_devices = fs_devices->seed;
> fs_devices->seed = NULL;
> @@ -1186,7 +1183,6 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices)
> close_fs_devices(fs_devices);
> free_fs_devices(fs_devices);
> }
> - return ret;
> }
>
> static int open_fs_devices(struct btrfs_fs_devices *fs_devices,
> diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h
> index 5eea93916fbf..76e5470e19a8 100644
> --- a/fs/btrfs/volumes.h
> +++ b/fs/btrfs/volumes.h
> @@ -435,7 +435,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices,
> struct btrfs_device *btrfs_scan_one_device(const char *path,
> fmode_t flags, void *holder);
> int btrfs_forget_devices(const char *path);
> -int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);
> +void 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_device *device,
> struct btrfs_device *this_dev);
>
Reviewed-by: Anand Jain <anand.jain@oracle.com>
next prev parent reply other threads:[~2020-08-29 15:15 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-15 10:48 [PATCH 0/5] Convert seed devices to proper list API Nikolay Borisov
2020-07-15 10:48 ` [PATCH 1/5] btrfs: Factor out reada loop in __reada_start_machine Nikolay Borisov
2020-08-18 15:02 ` Josef Bacik
2020-08-29 15:06 ` Anand Jain
2020-08-31 12:24 ` David Sterba
2020-07-15 10:48 ` [PATCH 2/5] btrfs: Factor out loop logic from btrfs_free_extra_devids Nikolay Borisov
2020-07-15 12:32 ` kernel test robot
2020-07-15 12:32 ` kernel test robot
2020-07-15 12:39 ` Nikolay Borisov
2020-07-15 17:39 ` kernel test robot
2020-07-16 7:17 ` [PATCH v2] " Nikolay Borisov
2020-08-29 15:13 ` Anand Jain
2020-08-18 15:03 ` [PATCH 2/5] " Josef Bacik
2020-07-15 10:48 ` [PATCH 3/5] btrfs: Make close_fs_devices return void Nikolay Borisov
2020-08-18 15:05 ` Josef Bacik
2020-08-29 15:14 ` Anand Jain [this message]
2020-07-15 10:48 ` [PATCH 4/5] btrfs: Simplify setting/clearing fs_info to btrfs_fs_devices Nikolay Borisov
2020-08-18 15:08 ` Josef Bacik
2020-08-26 10:50 ` Anand Jain
2020-07-15 10:48 ` [PATCH 5/5] btrfs: Switch seed device to list api Nikolay Borisov
2020-07-15 13:14 ` kernel test robot
2020-07-15 13:14 ` kernel test robot
2020-07-15 19:11 ` kernel test robot
2020-07-16 7:25 ` [PATCH v2] " Nikolay Borisov
2020-08-18 15:19 ` Josef Bacik
2020-08-30 14:39 ` Anand Jain
2020-07-24 7:36 ` [PATCH 5/5] " Nikolay Borisov
2020-09-02 15:58 ` Anand Jain
2020-09-03 9:03 ` Nikolay Borisov
2020-09-03 9:33 ` Anand Jain
2020-09-10 16:28 ` David Sterba
2020-07-22 14:26 ` [PATCH 0/5] Convert seed devices to proper list API David Sterba
2020-07-23 8:02 ` Nikolay Borisov
2020-08-21 14:33 ` David Sterba
2020-08-17 19:19 ` Nikolay Borisov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a09845f6-b790-14c0-01f6-7cde8f4c29f6@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=nborisov@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.