diff options
| author |   Chris Mason <clm@fb.com> | 2016-03-01 08:13:56 -0800 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2016-03-01 08:13:56 -0800 |
| commit | c05c5ee5ea40fe40df5e29471f583a0eb7c531e3 (patch) | |
| tree | c56a3336bf631d9e97f038f1253e8e99726eb3e5 /fs/btrfs/dev-replace.h | |
| parent | Linux 4.5-rc6 (diff) | |
| parent | Merge branch 'dev/control-ioctl' into for-chris-4.6 (diff) | |
| download | wireguard-linux-c05c5ee5ea40fe40df5e29471f583a0eb7c531e3.tar.xz wireguard-linux-c05c5ee5ea40fe40df5e29471f583a0eb7c531e3.zip | |
Merge tag 'for-chris' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux into for-linus-4.6
Btrfs patchsets for 4.6
Diffstat (limited to 'fs/btrfs/dev-replace.h')
| -rw-r--r-- | fs/btrfs/dev-replace.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/fs/btrfs/dev-replace.h b/fs/btrfs/dev-replace.h index 20035cbbf021..29e3ef5f96bd 100644 --- a/fs/btrfs/dev-replace.h +++ b/fs/btrfs/dev-replace.h @@ -34,8 +34,11 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info, void btrfs_dev_replace_suspend_for_unmount(struct btrfs_fs_info *fs_info); int btrfs_resume_dev_replace_async(struct btrfs_fs_info *fs_info); int btrfs_dev_replace_is_ongoing(struct btrfs_dev_replace *dev_replace); -void btrfs_dev_replace_lock(struct btrfs_dev_replace *dev_replace); -void btrfs_dev_replace_unlock(struct btrfs_dev_replace *dev_replace); +void btrfs_dev_replace_lock(struct btrfs_dev_replace *dev_replace, int rw); +void btrfs_dev_replace_unlock(struct btrfs_dev_replace *dev_replace, int rw); +void btrfs_dev_replace_set_lock_blocking(struct btrfs_dev_replace *dev_replace); +void btrfs_dev_replace_clear_lock_blocking( + struct btrfs_dev_replace *dev_replace); static inline void btrfs_dev_replace_stats_inc(atomic64_t *stat_value) { |