GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-07 15:18:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: remove unused fs_info arg from btrfs_close_extra_devices()

Browse source 
The commit:
8dabb74 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: Eric Sandeen <sandeen@redhat.com>
Signed-off-by: David Sterba <dsterba@suse.cz>
This commit is contained in:
Eric Sandeen 2014-08-01 18:12:35 -05:00 • committed by David Sterba
parent 41d6b13ea7
commit 9eaed21ef9
3 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fs/btrfs/disk-io.c
View file

@ -2690,7 +2690,7 @@ int open_ctree(struct super_block *sb,
* keep the device that is marked to be the target device for the * keep the device that is marked to be the target device for the
* dev_replace procedure * dev_replace procedure
*/ */
btrfs_close_extra_devices(fs_info, fs_devices, 0); btrfs_close_extra_devices(fs_devices, 0);
if (!fs_devices->latest_bdev) { if (!fs_devices->latest_bdev) {
printk(KERN_ERR "BTRFS: failed to read devices on %s\n", printk(KERN_ERR "BTRFS: failed to read devices on %s\n",
@ -2794,7 +2794,7 @@ retry_root_backup:
goto fail_block_groups; 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); ret = btrfs_sysfs_add_one(fs_info);
if (ret) { if (ret) {

3
fs/btrfs/volumes.c
View file

@ -609,8 +609,7 @@ error:
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
void btrfs_close_extra_devices(struct btrfs_fs_info *fs_info, void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step)
struct btrfs_fs_devices *fs_devices, int step)
{ {
struct btrfs_device *device, *next; struct btrfs_device *device, *next;
struct btrfs_device *latest_dev = NULL; struct btrfs_device *latest_dev = NULL;

3
fs/btrfs/volumes.h
View file

@ -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, int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder,
struct btrfs_fs_devices **fs_devices_ret); struct btrfs_fs_devices **fs_devices_ret);
int btrfs_close_devices(struct btrfs_fs_devices *fs_devices); int btrfs_close_devices(struct btrfs_fs_devices *fs_devices);
void btrfs_close_extra_devices(struct btrfs_fs_info *fs_info, void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step);
struct btrfs_fs_devices *fs_devices, int step);
int btrfs_find_device_missing_or_by_path(struct btrfs_root *root, int btrfs_find_device_missing_or_by_path(struct btrfs_root *root,
char *device_path, char *device_path,
struct btrfs_device **device); struct btrfs_device **device);