diff options
author | Chris Mason <clm@fb.com> | 2016-07-26 13:07:05 -0700 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2016-07-26 13:07:05 -0700 |
commit | 023a824f04754a4ed5efc16ee8e41bb932878b0b (patch) | |
tree | 8ae0bc5a61945bdec42d6c7a929967c548031d5d /fs/btrfs/async-thread.h | |
parent | 8b8b08cbfb9021af4b54b4175fc4c51d655aac8c (diff) | |
parent | 66642832f06a4351e23cea6cf254967c227f8224 (diff) | |
download | linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.tar.gz linux-023a824f04754a4ed5efc16ee8e41bb932878b0b.tar.xz |
Merge branch 'kdave-v4.8' into for-linus-4.8
Diffstat (limited to 'fs/btrfs/async-thread.h')
-rw-r--r-- | fs/btrfs/async-thread.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/fs/btrfs/async-thread.h b/fs/btrfs/async-thread.h index ad4d0647d1a6..8e52484cd461 100644 --- a/fs/btrfs/async-thread.h +++ b/fs/btrfs/async-thread.h @@ -21,6 +21,7 @@ #define __BTRFS_ASYNC_THREAD_ #include <linux/workqueue.h> +struct btrfs_fs_info; struct btrfs_workqueue; /* Internal use only */ struct __btrfs_workqueue; @@ -67,7 +68,8 @@ BTRFS_WORK_HELPER_PROTO(scrubnc_helper); BTRFS_WORK_HELPER_PROTO(scrubparity_helper); -struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, +struct btrfs_workqueue *btrfs_alloc_workqueue(struct btrfs_fs_info *fs_info, + const char *name, unsigned int flags, int limit_active, int thresh); @@ -80,4 +82,6 @@ void btrfs_queue_work(struct btrfs_workqueue *wq, void btrfs_destroy_workqueue(struct btrfs_workqueue *wq); void btrfs_workqueue_set_max(struct btrfs_workqueue *wq, int max); void btrfs_set_work_high_priority(struct btrfs_work *work); +struct btrfs_fs_info *btrfs_work_owner(struct btrfs_work *work); +struct btrfs_fs_info *btrfs_workqueue_owner(struct __btrfs_workqueue *wq); #endif |