diff options
| author | David Sterba | 2016-02-26 15:38:32 +0100 |
|---|---|---|
| committer | David Sterba | 2016-02-26 15:38:32 +0100 |
| commit | 675d276b322b45e7bf7c616a2847bdc425745b99 (patch) | |
| tree | c61e7108034bf1230024880ec8ae46a9617077c2 /fs/btrfs/ctree.h | |
| parent | Merge branch 'foreign/josef/space-updates' into for-chris-4.6 (diff) | |
| parent | Btrfs: fix lockdep deadlock warning due to dev_replace (diff) | |
| download | kernel-qcow2-linux-675d276b322b45e7bf7c616a2847bdc425745b99.tar.gz kernel-qcow2-linux-675d276b322b45e7bf7c616a2847bdc425745b99.tar.xz kernel-qcow2-linux-675d276b322b45e7bf7c616a2847bdc425745b99.zip | |
Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6
Diffstat (limited to 'fs/btrfs/ctree.h')
| -rw-r--r-- | fs/btrfs/ctree.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index e2a5cc0d4a14..38f34dadb86a 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h @@ -1005,8 +1005,10 @@ struct btrfs_dev_replace { pid_t lock_owner; atomic_t nesting_level; struct mutex lock_finishing_cancel_unmount; - struct mutex lock_management_lock; - struct mutex lock; + rwlock_t lock; + atomic_t read_locks; + atomic_t blocking_readers; + wait_queue_head_t read_lock_wq; struct btrfs_scrub_progress scrub_progress; }; |