Commit 3fff3975 authored Nov 26, 2019 by Johannes Thumshirn Committed by David Sterba Jan 20, 2020

btrfs: decrement number of open devices after closing the device not before



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

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 6bb6b514

fs/btrfs/volumes.c

+2 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message