[v5,1/2] btrfs: decrement number of open devices after closing the device not before
diff mbox series

Message ID 20191204133639.2382-2-jth@kernel.org
State New
Headers show
  • remove BUG_ON()s in btrfs_close_one_device()
Related show

Commit Message

Johannes Thumshirn Dec. 4, 2019, 1:36 p.m. UTC
From: Johannes Thumshirn <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 makes the code a bit harder to understand.

Move both operations closer together and move the decrement step after

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Qu Wenruo <wqu@suse.com>
 fs/btrfs/volumes.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff mbox series

diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index c565650639ee..ae3980ba3a87 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -1069,9 +1069,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) {
@@ -1082,6 +1079,8 @@  static void btrfs_close_one_device(struct btrfs_device *device)
+	if (device->bdev)
+		fs_devices->open_devices--;
 	new_device = btrfs_alloc_device(NULL, &device->devid,