From: Johannes Thumshirn <jthumshirn@suse.de>
To: David Sterba <dsterba@suse.com>
Cc: Linux BTRFS Mailinglist <linux-btrfs@vger.kernel.org>,
Johannes Thumshirn <jthumshirn@suse.de>
Subject: [PATCH 1/5] btrfs: decrement number of open devices after closing the device not before
Date: Tue, 12 Nov 2019 13:24:12 +0100 [thread overview]
Message-ID: <20191112122416.30672-2-jthumshirn@suse.de> (raw)
In-Reply-To: <20191112122416.30672-1-jthumshirn@suse.de>
In btrfs_close_one_device we're decrementing the number of open devices
before we're calling btrfs_close_bdev().
As there is no intermediate exit between these points in this function it
is technically OK to do so, but it a) is a bit harder to understand and b)
further refactoring to implement proper error handling in
btrfs_close_one_device() will change the layout of the function.
Move both operations closer together and move the decrement step after
btrfs_close_bdev().
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
---
fs/btrfs/volumes.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index 22a5bd991e47..5ee26e7fca32 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1067,9 +1067,6 @@ static void btrfs_close_one_device(struct btrfs_device *device)
struct btrfs_device *new_device;
struct rcu_string *name;
- if (device->bdev)
- fs_devices->open_devices--;
-
if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &device->dev_state) &&
device->devid != BTRFS_DEV_REPLACE_DEVID) {
list_del_init(&device->dev_alloc_list);
@@ -1080,6 +1077,8 @@ static void btrfs_close_one_device(struct btrfs_device *device)
fs_devices->missing_devices--;
btrfs_close_bdev(device);
+ if (device->bdev)
+ fs_devices->open_devices--;
new_device = btrfs_alloc_device(NULL, &device->devid,
device->uuid);
--
2.16.4
next prev parent reply other threads:[~2019-11-12 12:24 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-12 12:24 [PATCH 0/5] remove BUG_ON()s in btrfs_close_one_device() Johannes Thumshirn
2019-11-12 12:24 ` Johannes Thumshirn [this message]
2019-11-12 12:24 ` [PATCH 2/5] btrfs: handle device allocation failure " Johannes Thumshirn
2019-11-12 12:24 ` [PATCH 3/5] btrfs: handle allocation failure in strdup Johannes Thumshirn
2019-11-12 12:24 ` [PATCH 4/5] btrfs: handle error return of close_fs_devices() Johannes Thumshirn
2019-11-12 12:24 ` [PATCH 5/5] btrfs: remove final BUG_ON() in close_fs_devices() Johannes Thumshirn
2019-11-12 12:41 ` Qu Wenruo
2019-11-12 12:55 ` David Sterba
2019-11-12 12:59 ` Johannes Thumshirn
2019-11-12 12:40 ` [PATCH 0/5] remove BUG_ON()s in btrfs_close_one_device() Qu Wenruo
2019-11-12 12:57 ` Johannes Thumshirn
2019-11-12 12:49 ` David Sterba
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=20191112122416.30672-2-jthumshirn@suse.de \
--to=jthumshirn@suse.de \
--cc=dsterba@suse.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).