diff options
| author | Chris Mason <clm@fb.com> | 2015-03-25 13:52:48 -0400 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-03-25 13:52:48 -0400 |
| commit | fc4c3c872f44bf425963feba57eb9c3f8ac2d7eb (patch) | |
| tree | 0d49c3e4d8f64a4cc0d3f42f37430fc60007e28b /fs/btrfs/volumes.h | |
| parent | 9deed229fa8a83bb5cd713b2d2a8e5c022a4b45b (diff) | |
| parent | a4f3d2c4efe2628329249b64fd5799468e025b9d (diff) | |
Merge branch 'cleanups-post-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.1
Signed-off-by: Chris Mason <clm@fb.com>
Conflicts:
fs/btrfs/disk-io.c
Diffstat (limited to 'fs/btrfs/volumes.h')
| -rw-r--r-- | fs/btrfs/volumes.h | 3 |
1 files changed, 1 insertions, 2 deletions
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); |