diff options
| author | Chris Mason <clm@fb.com> | 2016-05-26 12:49:21 -0700 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-05-26 12:49:21 -0700 |
| commit | 9257b4ca9dff074918164e4fa10e9001c62bc27a (patch) | |
| tree | b2fb549b9549bead4d2837c81760cf87fa50ad43 /fs/btrfs/dev-replace.c | |
| parent | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (diff) | |
| parent | 4c6143dd497901e3537dc4324dc203dfda442009 (diff) | |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.7
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 85f12e6e28d21..63ef9cdf0144d 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, } /* - * blocked until all flighting bios are finished. + * blocked until all in-flight bios operations are finished. */ static void btrfs_rm_dev_replace_blocked(struct btrfs_fs_info *fs_info) { |