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

Commit 9eaed21e authored by Eric Sandeen's avatar Eric Sandeen Committed by David Sterba
Browse files

btrfs: remove unused fs_info arg from btrfs_close_extra_devices() 



The commit:
8dabb742 Btrfs: change core code of btrfs to support the
        device replace operations
added the fs_info argument, but never used it -
just remove it again.

Signed-off-by: default avatarEric Sandeen <sandeen@redhat.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 41d6b13e

fs/btrfs/disk-io.c

+2 −2
Original line number Diff line number Diff line
@@ -2690,7 +2690,7 @@ int open_ctree(struct super_block *sb, 
	 * keep the device that is marked to be the target device for the

	 * dev_replace procedure

	 */

	btrfs_close_extra_devices(fs_info, fs_devices, 0);

	btrfs_close_extra_devices(fs_devices, 0);



	if (!fs_devices->latest_bdev) {

		printk(KERN_ERR "BTRFS: failed to read devices on %s\n",
@@ -2794,7 +2794,7 @@ int open_ctree(struct super_block *sb, 
		goto fail_block_groups;

	}



	btrfs_close_extra_devices(fs_info, fs_devices, 1);

	btrfs_close_extra_devices(fs_devices, 1);



	ret = btrfs_sysfs_add_one(fs_info);

	if (ret) {

fs/btrfs/volumes.c

+1 −2
Original line number Diff line number Diff line
@@ -609,8 +609,7 @@ 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_info *fs_info,

			       struct btrfs_fs_devices *fs_devices, int step)

void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step)

{

	struct btrfs_device *device, *next;

	struct btrfs_device *latest_dev = NULL;

fs/btrfs/volumes.h

+1 −2
Original line number Diff line number Diff line
@@ -421,8 +421,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_info *fs_info,

			       struct btrfs_fs_devices *fs_devices, int step);

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

int btrfs_find_device_missing_or_by_path(struct btrfs_root *root,

					 char *device_path,

					 struct btrfs_device **device);