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

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

btrfs: rename btrfs_close_extra_device to btrfs_free_extra_devids 



This function btrfs_close_extra_devices() is about freeing
extra devids which once it may have belonged to this filesystem.
So rename it and add the comment. The _devid suffix is
appropriate as this function won't handle devices which are
outside of the filesytem being mounted.

Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d02c0e20

fs/btrfs/disk-io.c

+4 −4
Original line number Diff line number Diff line
@@ -2758,10 +2758,10 @@ int open_ctree(struct super_block *sb, 
	}



	/*

	 * keep the device that is marked to be the target device for the

	 * dev_replace procedure

	 * Keep the devid that is marked to be the target device for the

	 * device replace procedure

	 */

	btrfs_close_extra_devices(fs_devices, 0);

	btrfs_free_extra_devids(fs_devices, 0);



	if (!fs_devices->latest_bdev) {

		btrfs_err(fs_info, "failed to read devices");
@@ -2824,7 +2824,7 @@ int open_ctree(struct super_block *sb, 
		goto fail_block_groups;

	}



	btrfs_close_extra_devices(fs_devices, 1);

	btrfs_free_extra_devids(fs_devices, 1);



	ret = btrfs_sysfs_add_fsid(fs_devices, NULL);

	if (ret) {

fs/btrfs/volumes.c

+5 −1
Original line number Diff line number Diff line
@@ -896,7 +896,11 @@ static struct btrfs_fs_devices *clone_fs_devices(struct btrfs_fs_devices *orig) 
	return ERR_PTR(-ENOMEM);

}



void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step)

/*

 * After we have read the system tree and know devids belonging to

 * this filesystem, remove the device which does not belong there.

 */

void btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices, int step)

{

	struct btrfs_device *device, *next;

	struct btrfs_device *latest_dev = NULL;

fs/btrfs/volumes.h

+1 −1
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, 
int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,

			  struct btrfs_fs_devices **fs_devices_ret);

int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);

void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step);

void btrfs_free_extra_devids(struct btrfs_fs_devices *fs_devices, int step);

void btrfs_assign_next_active_device(struct btrfs_fs_info *fs_info,

		struct btrfs_device *device, struct btrfs_device *this_dev);

int btrfs_find_device_missing_or_by_path(struct btrfs_fs_info *fs_info,