diff options
| author | Eric Sandeen <sandeen@redhat.com> | 2014-08-01 19:12:35 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.cz> | 2015-02-16 12:48:45 -0500 |
| commit | 9eaed21ef94b5da30eaf1b2503df1d41c2025175 (patch) | |
| tree | dd5be544737590e28e1548b057f70b853a53142a /fs | |
| parent | 41d6b13ea7b459cd51d4446c9b264128a52db993 (diff) | |
btrfs: remove unused fs_info arg from btrfs_close_extra_devices()
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>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/btrfs/disk-io.c | 4 | ||||
| -rw-r--r-- | fs/btrfs/volumes.c | 3 | ||||
| -rw-r--r-- | fs/btrfs/volumes.h | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 6911aa4caa0d..d91f08994d3c 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
| @@ -2690,7 +2690,7 @@ int open_ctree(struct super_block *sb, | |||
| 2690 | * keep the device that is marked to be the target device for the | 2690 | * keep the device that is marked to be the target device for the |
| 2691 | * dev_replace procedure | 2691 | * dev_replace procedure |
| 2692 | */ | 2692 | */ |
| 2693 | btrfs_close_extra_devices(fs_info, fs_devices, 0); | 2693 | btrfs_close_extra_devices(fs_devices, 0); |
| 2694 | 2694 | ||
| 2695 | if (!fs_devices->latest_bdev) { | 2695 | if (!fs_devices->latest_bdev) { |
| 2696 | printk(KERN_ERR "BTRFS: failed to read devices on %s\n", | 2696 | printk(KERN_ERR "BTRFS: failed to read devices on %s\n", |
| @@ -2794,7 +2794,7 @@ retry_root_backup: | |||
| 2794 | goto fail_block_groups; | 2794 | goto fail_block_groups; |
| 2795 | } | 2795 | } |
| 2796 | 2796 | ||
| 2797 | btrfs_close_extra_devices(fs_info, fs_devices, 1); | 2797 | btrfs_close_extra_devices(fs_devices, 1); |
| 2798 | 2798 | ||
| 2799 | ret = btrfs_sysfs_add_one(fs_info); | 2799 | ret = btrfs_sysfs_add_one(fs_info); |
| 2800 | if (ret) { | 2800 | if (ret) { |
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index d7d1dde5f2ff..6d4fb246eb7e 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
| @@ -609,8 +609,7 @@ error: | |||
| 609 | return ERR_PTR(-ENOMEM); | 609 | return ERR_PTR(-ENOMEM); |
| 610 | } | 610 | } |
| 611 | 611 | ||
| 612 | void btrfs_close_extra_devices(struct btrfs_fs_info *fs_info, | 612 | void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step) |
| 613 | struct btrfs_fs_devices *fs_devices, int step) | ||
| 614 | { | 613 | { |
| 615 | struct btrfs_device *device, *next; | 614 | struct btrfs_device *device, *next; |
| 616 | struct btrfs_device *latest_dev = NULL; | 615 | struct btrfs_device *latest_dev = NULL; |
diff --git a/fs/btrfs/volumes.h b/fs/btrfs/volumes.h index 83069dec6898..ebc31331a837 100644 --- a/fs/btrfs/volumes.h +++ b/fs/btrfs/volumes.h | |||
| @@ -421,8 +421,7 @@ int btrfs_open_devices(struct btrfs_fs_devices *fs_devices, | |||
| 421 | int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, | 421 | int btrfs_scan_one_device(const char *path, fmode_t flags, void *holder, |
| 422 | struct btrfs_fs_devices **fs_devices_ret); | 422 | struct btrfs_fs_devices **fs_devices_ret); |
| 423 | int btrfs_close_devices(struct btrfs_fs_devices *fs_devices); | 423 | int btrfs_close_devices(struct btrfs_fs_devices *fs_devices); |
| 424 | void btrfs_close_extra_devices(struct btrfs_fs_info *fs_info, | 424 | void btrfs_close_extra_devices(struct btrfs_fs_devices *fs_devices, int step); |
| 425 | struct btrfs_fs_devices *fs_devices, int step); | ||
| 426 | int btrfs_find_device_missing_or_by_path(struct btrfs_root *root, | 425 | int btrfs_find_device_missing_or_by_path(struct btrfs_root *root, |
| 427 | char *device_path, | 426 | char *device_path, |
| 428 | struct btrfs_device **device); | 427 | struct btrfs_device **device); |