Merge branch 'cleanups-4.7' into for-chris-4.7-20160525

This commit is contained in:
David Sterba 2016-05-25 22:51:03 +02:00
commit 42f31734eb
36 changed files with 193 additions and 196 deletions

View file

@ -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)
{