Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f011058 authored by David Sterba's avatar David Sterba
Browse files

btrfs: use correct type for workqueue flags 



Through all the local wrappers to alloc_workqueue, __alloc_workqueue_key
takes an unsigned int.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.cz>
parent 4bbcaa64

fs/btrfs/async-thread.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -87,7 +87,7 @@ BTRFS_WORK_HELPER(scrubwrc_helper); 
BTRFS_WORK_HELPER(scrubnc_helper);

BTRFS_WORK_HELPER(scrubnc_helper);





static struct __btrfs_workqueue *

static struct __btrfs_workqueue *

__btrfs_alloc_workqueue(const char *name, int flags, int max_active,

__btrfs_alloc_workqueue(const char *name, unsigned int flags, int max_active,

			 int thresh)

			 int thresh)

{

{

	struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);

	struct __btrfs_workqueue *ret = kzalloc(sizeof(*ret), GFP_NOFS);
@@ -132,7 +132,7 @@ static inline void 
__btrfs_destroy_workqueue(struct __btrfs_workqueue *wq);

__btrfs_destroy_workqueue(struct __btrfs_workqueue *wq);





struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

					      int flags,

					      unsigned int flags,

					      int max_active,

					      int max_active,

					      int thresh)

					      int thresh)

{

{

fs/btrfs/async-thread.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -66,7 +66,7 @@ BTRFS_WORK_HELPER_PROTO(scrubwrc_helper); 
BTRFS_WORK_HELPER_PROTO(scrubnc_helper);

BTRFS_WORK_HELPER_PROTO(scrubnc_helper);





struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

struct btrfs_workqueue *btrfs_alloc_workqueue(const char *name,

					      int flags,

					      unsigned int flags,

					      int max_active,

					      int max_active,

					      int thresh);

					      int thresh);

void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t helper,

void btrfs_init_work(struct btrfs_work *work, btrfs_work_func_t helper,

fs/btrfs/disk-io.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -2227,7 +2227,7 @@ static int btrfs_init_workqueues(struct btrfs_fs_info *fs_info, 
		struct btrfs_fs_devices *fs_devices)

		struct btrfs_fs_devices *fs_devices)

{

{

	int max_active = fs_info->thread_pool_size;

	int max_active = fs_info->thread_pool_size;

	int flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND;

	unsigned int flags = WQ_MEM_RECLAIM | WQ_FREEZABLE | WQ_UNBOUND;





	fs_info->workers =

	fs_info->workers =

		btrfs_alloc_workqueue("worker", flags | WQ_HIGHPRI,

		btrfs_alloc_workqueue("worker", flags | WQ_HIGHPRI,

fs/btrfs/scrub.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3561,7 +3561,7 @@ static noinline_for_stack int scrub_workers_get(struct btrfs_fs_info *fs_info, 
						int is_dev_replace)

						int is_dev_replace)

{

{

	int ret = 0;

	int ret = 0;

	int flags = WQ_FREEZABLE | WQ_UNBOUND;

	unsigned int flags = WQ_FREEZABLE | WQ_UNBOUND;

	int max_active = fs_info->thread_pool_size;

	int max_active = fs_info->thread_pool_size;





	if (fs_info->scrub_workers_refcnt == 0) {

	if (fs_info->scrub_workers_refcnt == 0) {