Commit 7ad3912a authored Sep 05, 2020 by Anand Jain Committed by David Sterba Oct 07, 2020

btrfs: handle errors in btrfs_sysfs_add_fs_devices



btrfs_sysfs_add_fs_devices() is called by btrfs_sysfs_add_mounted().
btrfs_sysfs_add_mounted() assumes that btrfs_sysfs_add_fs_devices() will
either add sysfs entries for all the devices or none. So this patch keeps up
to its caller expecatation and cleans up the created sysfs entries if it
has to fail at some device in the list.

Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 30b0e4e0

fs/btrfs/sysfs.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1362,18 +1362,22 @@ static int btrfs_sysfs_add_fs_devices(struct btrfs_fs_devices *fs_devices)
		list_for_each_entry(device, &fs_devices->devices, dev_list) {
		ret = btrfs_sysfs_add_device(device);
		if (ret)
		return ret;
		goto fail;
		}

		list_for_each_entry(seed, &fs_devices->seed_list, seed_list) {
		list_for_each_entry(device, &seed->devices, dev_list) {
		ret = btrfs_sysfs_add_device(device);
		if (ret)
		return ret;
		goto fail;
		}
		}

		return 0;

		fail:
		btrfs_sysfs_remove_fs_devices(fs_devices);
		return ret;
		}

		void btrfs_kobject_uevent(struct block_device *bdev, enum kobject_action action)