From: Anand Jain <anand.jain@oracle.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 4/6] btrfs: make btrfs_free_stale_device() argument optional
Date: Fri, 15 Dec 2017 11:47:37 +0800 [thread overview]
Message-ID: <20171215034739.26090-5-anand.jain@oracle.com> (raw)
In-Reply-To: <20171215034739.26090-1-anand.jain@oracle.com>
This updates btrfs_free_stale_device() helper function to delete all
unmouted devices, when arg is NULL.
Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
fs/btrfs/volumes.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 70db6a1d5658..9aee4f987221 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -613,9 +613,6 @@ static void btrfs_free_stale_device(struct btrfs_device *cur_dev)
struct btrfs_fs_devices *fs_devs, *tmp_fs_devs;
struct btrfs_device *dev, *tmp_dev;
- if (!cur_dev->name)
- return;
-
list_for_each_entry_safe(fs_devs, tmp_fs_devs, &fs_uuids, list) {
if (fs_devs->opened)
@@ -625,9 +622,7 @@ static void btrfs_free_stale_device(struct btrfs_device *cur_dev)
&fs_devs->devices, dev_list) {
int not_found;
- if (dev == cur_dev)
- continue;
- if (!dev->name)
+ if (cur_dev && (cur_dev == dev || !dev->name))
continue;
/*
@@ -637,8 +632,11 @@ static void btrfs_free_stale_device(struct btrfs_device *cur_dev)
* either use mapper or non mapper path throughout.
*/
rcu_read_lock();
- not_found = strcmp(rcu_str_deref(dev->name),
- rcu_str_deref(cur_dev->name));
+ if (cur_dev)
+ not_found = strcmp(rcu_str_deref(dev->name),
+ rcu_str_deref(cur_dev->name));
+ else
+ not_found = 0;
rcu_read_unlock();
if (not_found)
continue;
--
2.7.0
next prev parent reply other threads:[~2017-12-15 3:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-15 3:47 [PATCH 0/6] preparatory work to add device forget Anand Jain
2017-12-15 3:47 ` [PATCH 1/6] btrfs: cleanup btrfs_free_stale_device() usage Anand Jain
2017-12-15 15:33 ` Nikolay Borisov
2017-12-16 2:15 ` Anand Jain
2017-12-15 3:47 ` [PATCH 2/6] btrfs: no need to check for btrfs_fs_devices::seeding Anand Jain
2017-12-15 3:47 ` [PATCH 3/6] btrfs: make btrfs_free_stale_device() to iterate all stales Anand Jain
2017-12-15 15:06 ` Nikolay Borisov
2017-12-16 2:13 ` Anand Jain
2017-12-16 6:54 ` Nikolay Borisov
2017-12-15 3:47 ` Anand Jain [this message]
2017-12-15 15:07 ` [PATCH 4/6] btrfs: make btrfs_free_stale_device() argument optional Nikolay Borisov
2017-12-16 2:14 ` Anand Jain
2017-12-16 6:55 ` Nikolay Borisov
2017-12-15 3:47 ` [PATCH 5/6] btrfs: make btrfs_free_stale_device() to match the path Anand Jain
2017-12-15 3:47 ` [PATCH 6/6] btrfs: cleanup to make btrfs_free_stale_device() readable Anand Jain
2017-12-15 11:29 ` [PATCH v2 1/6] " Anand Jain
2017-12-15 13:07 ` [PATCH v2 6/6] " Anand Jain
2017-12-16 2:48 ` [PATCH v3 " Anand Jain
-- strict thread matches above, loose matches on Subject: below --
2018-01-09 14:13 [PATCH RESEND v3 0/6] preparatory work to add device forget Anand Jain
2018-01-09 14:13 ` [PATCH 4/6] btrfs: make btrfs_free_stale_device() argument optional Anand Jain
2018-01-09 16:22 ` Josef Bacik
2018-01-10 5:15 [PATCH v4 0/6] preparatory work to add device forget Anand Jain
2018-01-10 5:15 ` [PATCH 4/6] btrfs: make btrfs_free_stale_device() argument optional Anand Jain
2018-01-10 15:50 ` Josef Bacik
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=20171215034739.26090-5-anand.jain@oracle.com \
--to=anand.jain@oracle.com \
--cc=linux-btrfs@vger.kernel.org \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).