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

Commit a1ae0f74 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe
Browse files

blk-mq-debug: Avoid that sparse complains about req_flags_t usage 



Avoid that sparse reports the following complaints:

block/elevator.c:541:29: warning: incorrect type in assignment (different base types)
block/elevator.c:541:29:    expected bool [unsigned] [usertype] next_sorted
block/elevator.c:541:29:    got restricted req_flags_t

block/blk-mq-debugfs.c:92:54: warning: cast from restricted req_flags_t

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: default avatarOmar Sandoval <osandov@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent f3bcb0e6

block/blk-mq-debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ static int blk_mq_debugfs_rq_show(struct seq_file *m, void *v) 
	struct request *rq = list_entry_rq(v);



	seq_printf(m, "%p {.cmd_flags=0x%x, .rq_flags=0x%x, .tag=%d, .internal_tag=%d}\n",

		   rq, rq->cmd_flags, (unsigned int)rq->rq_flags,

		   rq, rq->cmd_flags, (__force unsigned int)rq->rq_flags,

		   rq->tag, rq->internal_tag);

	return 0;

}

block/elevator.c

+1 −1
Original line number Diff line number Diff line
@@ -538,7 +538,7 @@ void elv_merge_requests(struct request_queue *q, struct request *rq, 
	if (e->uses_mq && e->type->ops.mq.requests_merged)

		e->type->ops.mq.requests_merged(q, rq, next);

	else if (e->type->ops.sq.elevator_merge_req_fn) {

		next_sorted = next->rq_flags & RQF_SORTED;

		next_sorted = (__force bool)(next->rq_flags & RQF_SORTED);

		if (next_sorted)

			e->type->ops.sq.elevator_merge_req_fn(q, rq, next);

	}