diff options
| author | David Sterba <dsterba@suse.com> | 2018-11-22 19:34:52 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-11-22 19:34:52 +0100 |
| commit | 2439511a27fc04b1ede226f3c369382917003137 (patch) | |
| tree | 38f9c9680d13fd6d471bcea1dfb28d1006d5a171 /fs/btrfs/disk-io.c | |
| parent | 8af035ac60a82c29a21754d120762bf9ba8705be (diff) | |
| parent | 5e2f7a124c8adb5f9ef8e05a4c6f9226ac69f242 (diff) | |
| download | linux-next-2439511a27fc04b1ede226f3c369382917003137.tar.gz | |
Merge branch 'dev/dev-replace-locking' into for-next-next-v4.20-20181122
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index aac08ae7bc88..c309835d4700 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -2132,10 +2132,8 @@ static void btrfs_init_btree_inode(struct btrfs_fs_info *fs_info) static void btrfs_init_dev_replace_locks(struct btrfs_fs_info *fs_info) { mutex_init(&fs_info->dev_replace.lock_finishing_cancel_unmount); - rwlock_init(&fs_info->dev_replace.lock); - atomic_set(&fs_info->dev_replace.blocking_readers, 0); + init_rwsem(&fs_info->dev_replace.rwsem); init_waitqueue_head(&fs_info->dev_replace.replace_wait); - init_waitqueue_head(&fs_info->dev_replace.read_lock_wq); } static void btrfs_init_qgroup(struct btrfs_fs_info *fs_info) |