Skip to content

block: fix arg type in blk_mq_update_nr_hw_queues #942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blktests-ci wants to merge 1 commit into
base: linus-master_base
Choose a base branch
from
Open

block: fix arg type in blk_mq_update_nr_hw_queues #942

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions block/blk-mq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4786,10 +4786,10 @@ static void blk_mq_update_queue_map(struct blk_mq_tag_set *set)

static struct blk_mq_tags **blk_mq_prealloc_tag_set_tags(
struct blk_mq_tag_set *set,
int new_nr_hw_queues)
unsigned int new_nr_hw_queues)
{
struct blk_mq_tags **new_tags;
int i;
unsigned int i;

if (set->nr_hw_queues >= new_nr_hw_queues)
return NULL;
Expand Down Expand Up @@ -5104,12 +5104,12 @@ static int blk_mq_elv_switch_none(struct request_queue *q,
}

static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,
int nr_hw_queues)
unsigned int nr_hw_queues)
{
struct request_queue *q;
int prev_nr_hw_queues = set->nr_hw_queues;
unsigned int prev_nr_hw_queues = set->nr_hw_queues;
unsigned int memflags;
int i;
unsigned int i;
struct xarray elv_tbl;
struct blk_mq_tags **new_tags;
bool queues_frozen = false;
Expand Down Expand Up @@ -5204,7 +5204,8 @@ static void __blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,
__blk_mq_free_map_and_rqs(set, i);
}

void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues)
void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set,
unsigned int nr_hw_queues)
{
down_write(&set->update_nr_hwq_lock);
mutex_lock(&set->tag_list_lock);
Expand Down
2 changes: 1 addition & 1 deletion include/linux/blk-mq.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ unsigned int blk_mq_num_online_queues(unsigned int max_queues);
void blk_mq_map_queues(struct blk_mq_queue_map *qmap);
void blk_mq_map_hw_queues(struct blk_mq_queue_map *qmap,
struct device *dev, unsigned int offset);
void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, int nr_hw_queues);
void blk_mq_update_nr_hw_queues(struct blk_mq_tag_set *set, unsigned int nr_hw_queues);

void blk_mq_quiesce_queue_nowait(struct request_queue *q);

Expand Down
Loading