[PATCH v5 1/2] btrfs: decrement number of open devices after closing the device not before

Johannes Thumshirn
2019-12-04T13:37:14Z

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
btrfs_close_bdev().

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 --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) {
list_del_init(&device->dev_alloc_list);
@@ -1082,6 +1079,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.20.1 (Apple Git-117)