diff options
| author | David Sterba <dsterba@suse.com> | 2016-05-25 16:51:03 -0400 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-05-25 16:51:03 -0400 |
| commit | 42f31734eb7658fd01fb186d56312be869450a42 (patch) | |
| tree | b2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/dev-replace.c | |
| parent | e73440868fde7cce4a93583a4fa2db9a8938a7ed (diff) | |
| parent | 0132761017e012ab4dc8584d679503f2ba26ca86 (diff) | |
Merge branch 'cleanups-4.7' into for-chris-4.7-20160525
Diffstat (limited to 'fs/btrfs/dev-replace.c')
| -rw-r--r-- | fs/btrfs/dev-replace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 85f12e6e28d2..63ef9cdf0144 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c | |||
| @@ -450,7 +450,7 @@ int btrfs_dev_replace_by_ioctl(struct btrfs_root *root, | |||
| 450 | } | 450 | } |
| 451 | 451 | ||
| 452 | /* | 452 | /* |
| 453 | * blocked until all flighting bios are finished. | 453 | * blocked until all in-flight bios operations are finished. |
| 454 | */ | 454 | */ |
| 455 | static void btrfs_rm_dev_replace_blocked(struct btrfs_fs_info *fs_info) | 455 | static void btrfs_rm_dev_replace_blocked(struct btrfs_fs_info *fs_info) |
| 456 | { | 456 | { |