Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e6e674bd authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: cleanup device states define BTRFS_DEV_STATE_MISSING 



Currently device state is being managed by each individual int
variable such as struct btrfs_device::missing. Instead of that
declare btrfs_device::dev_state BTRFS_DEV_STATE_MISSING and use
the bit operations.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by : Nikolay Borisov <nborisov@suse.com>
[ whitespace adjustments ]
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent e12c9621

fs/btrfs/dev-replace.c

+1 −1
Original line number Diff line number Diff line
@@ -306,7 +306,7 @@ void btrfs_after_dev_replace_commit(struct btrfs_fs_info *fs_info) 


static char* btrfs_dev_name(struct btrfs_device *device)

{

	if (device->missing)

	if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state))

		return "<missing disk>";

	else

		return rcu_str_deref(device->name);

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -3389,7 +3389,7 @@ static int barrier_all_devices(struct btrfs_fs_info *info) 
	/* send down all the barriers */

	head = &info->fs_devices->devices;

	list_for_each_entry(dev, head, dev_list) {

		if (dev->missing)

		if (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state))

			continue;

		if (!dev->bdev)

			continue;
@@ -3403,7 +3403,7 @@ static int barrier_all_devices(struct btrfs_fs_info *info) 


	/* wait for all the barriers */

	list_for_each_entry(dev, head, dev_list) {

		if (dev->missing)

		if (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state))

			continue;

		if (!dev->bdev) {

			errors_wait++;

fs/btrfs/scrub.c

+4 −3
Original line number Diff line number Diff line
@@ -2535,7 +2535,7 @@ static int scrub_pages(struct scrub_ctx *sctx, u64 logical, u64 len, 
	}



	WARN_ON(sblock->page_count == 0);

	if (dev->missing) {

	if (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state)) {

		/*

		 * This case should only be hit for RAID 5/6 device replace. See

		 * the comment in scrub_missing_raid56_pages() for details.
@@ -2870,7 +2870,7 @@ static int scrub_extent_for_parity(struct scrub_parity *sparity, 
	u8 csum[BTRFS_CSUM_SIZE];

	u32 blocksize;



	if (dev->missing) {

	if (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state)) {

		scrub_parity_mark_sectors_error(sparity, logical, len);

		return 0;

	}
@@ -4112,7 +4112,8 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, 


	mutex_lock(&fs_info->fs_devices->device_list_mutex);

	dev = btrfs_find_device(fs_info, devid, NULL, NULL);

	if (!dev || (dev->missing && !is_dev_replace)) {

	if (!dev || (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state) &&

		     !is_dev_replace)) {

		mutex_unlock(&fs_info->fs_devices->device_list_mutex);

		return -ENODEV;

	}

fs/btrfs/super.c

+1 −1
Original line number Diff line number Diff line
@@ -2270,7 +2270,7 @@ static int btrfs_show_devname(struct seq_file *m, struct dentry *root) 
	while (cur_devices) {

		head = &cur_devices->devices;

		list_for_each_entry(dev, head, dev_list) {

			if (dev->missing)

			if (test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state))

				continue;

			if (!dev->name)

				continue;

fs/btrfs/volumes.c

+19 −13
Original line number Diff line number Diff line
@@ -825,9 +825,9 @@ static noinline int device_list_add(const char *path, 
			return -ENOMEM;

		rcu_string_free(device->name);

		rcu_assign_pointer(device->name, name);

		if (device->missing) {

		if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state)) {

			fs_devices->missing_devices--;

			device->missing = 0;

			clear_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state);

		}

	}
@@ -996,7 +996,7 @@ static void btrfs_prepare_close_one_device(struct btrfs_device *device) 
		fs_devices->rw_devices--;

	}



	if (device->missing)

	if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state))

		fs_devices->missing_devices--;



	new_device = btrfs_alloc_device(NULL, &device->devid,
@@ -1882,7 +1882,8 @@ static struct btrfs_device * btrfs_find_next_active_device( 


	list_for_each_entry(next_device, &fs_devs->devices, dev_list) {

		if (next_device != device &&

			!next_device->missing && next_device->bdev)

		    !test_bit(BTRFS_DEV_STATE_MISSING, &next_device->dev_state)

		    && next_device->bdev)

			return next_device;

	}
@@ -1996,7 +1997,7 @@ int btrfs_rm_device(struct btrfs_fs_info *fs_info, const char *device_path, 
	device->fs_devices->num_devices--;

	device->fs_devices->total_devices--;



	if (device->missing)

	if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state))

		device->fs_devices->missing_devices--;



	btrfs_assign_next_active_device(fs_info, device, NULL);
@@ -2071,7 +2072,7 @@ void btrfs_rm_dev_replace_remove_srcdev(struct btrfs_fs_info *fs_info, 
	list_del_rcu(&srcdev->dev_list);

	list_del(&srcdev->dev_alloc_list);

	fs_devices->num_devices--;

	if (srcdev->missing)

	if (test_bit(BTRFS_DEV_STATE_MISSING, &srcdev->dev_state))

		fs_devices->missing_devices--;



	if (test_bit(BTRFS_DEV_STATE_WRITEABLE, &srcdev->dev_state))
@@ -5089,7 +5090,8 @@ int btrfs_chunk_readonly(struct btrfs_fs_info *fs_info, u64 chunk_offset) 


	map = em->map_lookup;

	for (i = 0; i < map->num_stripes; i++) {

		if (map->stripes[i].dev->missing) {

		if (test_bit(BTRFS_DEV_STATE_MISSING,

					&map->stripes[i].dev->dev_state)) {

			miss_ndevs++;

			continue;

		}
@@ -6117,7 +6119,8 @@ static noinline void btrfs_schedule_bio(struct btrfs_device *device, 
	int should_queue = 1;

	struct btrfs_pending_bios *pending_bios;



	if (device->missing || !device->bdev) {

	if (test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state) ||

	    !device->bdev) {

		bio_io_error(bio);

		return;

	}
@@ -6313,7 +6316,7 @@ static struct btrfs_device *add_missing_dev(struct btrfs_fs_devices *fs_devices, 
	device->fs_devices = fs_devices;

	fs_devices->num_devices++;



	device->missing = 1;

	set_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state);

	fs_devices->missing_devices++;



	return device;
@@ -6675,7 +6678,8 @@ static int read_one_dev(struct btrfs_fs_info *fs_info, 
							dev_uuid, false);

		}



		if(!device->bdev && !device->missing) {

		if (!device->bdev &&

		    !test_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state)) {

			/*

			 * this happens when a device that was properly setup

			 * in the device info lists suddenly goes bad.
@@ -6683,12 +6687,13 @@ static int read_one_dev(struct btrfs_fs_info *fs_info, 
			 * device->missing to one here

			 */

			device->fs_devices->missing_devices++;

			device->missing = 1;

			set_bit(BTRFS_DEV_STATE_MISSING, &device->dev_state);

		}



		/* Move the device to its own fs_devices */

		if (device->fs_devices != fs_devices) {

			ASSERT(device->missing);

			ASSERT(test_bit(BTRFS_DEV_STATE_MISSING,

							&device->dev_state));



			list_move(&device->dev_list, &fs_devices->devices);

			device->fs_devices->num_devices--;
@@ -6874,7 +6879,8 @@ bool btrfs_check_rw_degradable(struct btrfs_fs_info *fs_info) 
		for (i = 0; i < map->num_stripes; i++) {

			struct btrfs_device *dev = map->stripes[i].dev;



			if (!dev || !dev->bdev || dev->missing ||

			if (!dev || !dev->bdev ||

			    test_bit(BTRFS_DEV_STATE_MISSING, &dev->dev_state) ||

			    dev->last_flush_error)

				missing++;

		}