diff options
-rw-r--r-- | fs/btrfs/async-thread.c | 4 | ||||
-rw-r--r-- | fs/btrfs/async-thread.h | 2 | ||||
-rw-r--r-- | fs/btrfs/disk-io.c | 2 | ||||
-rw-r--r-- | fs/btrfs/scrub.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/async-thread.c b/fs/btrfs/async-thread.c index 4dabeb893b7c..df9932b00d08 100644 --- a/fs/btrfs/async-thread.c +++ b/fs/btrfs/async-thread.c | |||
@@ -87,7 +87,7 @@ BTRFS_WORK_HELPER(scrubwrc_helper); | |||
87 | BTRFS_WORK_HELPER(scrubnc_helper); | 87 | BTRFS_WORK_HELPER(scrubnc_helper); |
88 | 88 | ||
89 | static struct __btrfs_workqueue * | 89 | static struct __btrfs_workqueue * |
90 | __btrfs_alloc_workqueue(const char *name, int flags, int max_active, | 90 | __btrfs_alloc_workqueue(const char *name, unsigned int flags, int max_active, |
91 | int thresh) | 91 | int thresh) |
92 | { | 92 | { |
93 | struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS); | 93 | struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS); |
@@ -132,7 +132,7 @@ static inline void | |||
132 | __btrfs_destroy_workqueue(struct __btrfs_workqueue *wq); | 132 | __btrfs_destroy_workqueue(struct __btrfs_workqueue *wq); |
133 | 133 | ||
134 | struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, | 134 | struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, |
135 | int flags, | 135 | unsigned int flags, |
136 | int max_active, | 136 | int max_active, |
137 | int thresh) | 137 | int thresh) |
138 | { | 138 | { |
diff --git a/fs/btrfs/async-thread.h b/fs/btrfs/async-thread.h index e386c29ef1f6..ec2ee477f8ba 100644 --- a/fs/btrfs/async-thread.h +++ b/fs/btrfs/async-thread.h | |||
@@ -66,7 +66,7 @@ BTRFS_WORK_HELPER_PROTO(scrubwrc_helper); | |||
66 | BTRFS_WORK_HELPER_PROTO(scrubnc_helper); | 66 | BTRFS_WORK_HELPER_PROTO(scrubnc_helper); |
67 | 67 | ||
68 | struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, | 68 | struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name, |
69 | int flags, | 69 | unsigned int flags, |
70 | int max_active, | 70 | int max_active, |
71 | int thresh); | 71 | int thresh); |
72 | void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t helper, | 72 | void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t helper, |
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index c7546d6512cc..29cb50b4981e 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c | |||
@@ -2227,7 +2227,7 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info, | |||
2227 | struct btrfs_fs_devices *fs_devices) | 2227 | struct btrfs_fs_devices *fs_devices) |
2228 | { | 2228 | { |
2229 | int max_active = fs_info->thread_pool_size; | 2229 | int max_active = fs_info->thread_pool_size; |
2230 | int flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND; | 2230 | unsigned int flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND; |
2231 | 2231 | ||
2232 | fs_info->workers = | 2232 | fs_info->workers = |
2233 | btrfs_alloc_workqueue("worker", flags | WQ_HIGHPRI, | 2233 | btrfs_alloc_workqueue("worker", flags | WQ_HIGHPRI, |
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index db21f17df996..4af5f49a3105 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c | |||
@@ -3561,7 +3561,7 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info, | |||
3561 | int is_dev_replace) | 3561 | int is_dev_replace) |
3562 | { | 3562 | { |
3563 | int ret = 0; | 3563 | int ret = 0; |
3564 | int flags = WQ_FREEZABLE | WQ_UNBOUND; | 3564 | unsigned int flags = WQ_FREEZABLE | WQ_UNBOUND; |
3565 | int max_active = fs_info->thread_pool_size; | 3565 | int max_active = fs_info->thread_pool_size; |
3566 | 3566 | ||
3567 | if (fs_info->scrub_workers_refcnt == 0) { | 3567 | if (fs_info->scrub_workers_refcnt == 0) { |