Commit 66f91322 authored by Bart Van Assche's avatar Bart Van Assche Committed by Jens Axboe

block: Reorder the queue flag manipulation function definitions

Move the definition of queue_flag_clear_unlocked() up and move the
definition of queue_in_flight() down such that all queue flag
manipulation function definitions become contiguous.

This patch does not change any functionality.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Hannes Reinecke <hare@suse.de>
Cc: Ming Lei <ming.lei@redhat.com>
Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent d15e1175
...@@ -726,6 +726,12 @@ static inline void queue_flag_set_unlocked(unsigned int flag, ...@@ -726,6 +726,12 @@ static inline void queue_flag_set_unlocked(unsigned int flag,
__set_bit(flag, &q->queue_flags); __set_bit(flag, &q->queue_flags);
} }
static inline void queue_flag_clear_unlocked(unsigned int flag,
struct request_queue *q)
{
__clear_bit(flag, &q->queue_flags);
}
static inline int queue_flag_test_and_clear(unsigned int flag, static inline int queue_flag_test_and_clear(unsigned int flag,
struct request_queue *q) struct request_queue *q)
{ {
...@@ -758,17 +764,6 @@ static inline void queue_flag_set(unsigned int flag, struct request_queue *q) ...@@ -758,17 +764,6 @@ static inline void queue_flag_set(unsigned int flag, struct request_queue *q)
__set_bit(flag, &q->queue_flags); __set_bit(flag, &q->queue_flags);
} }
static inline void queue_flag_clear_unlocked(unsigned int flag,
struct request_queue *q)
{
__clear_bit(flag, &q->queue_flags);
}
static inline int queue_in_flight(struct request_queue *q)
{
return q->in_flight[0] + q->in_flight[1];
}
static inline void queue_flag_clear(unsigned int flag, struct request_queue *q) static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
{ {
queue_lockdep_assert_held(q); queue_lockdep_assert_held(q);
...@@ -804,6 +799,11 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q) ...@@ -804,6 +799,11 @@ static inline void queue_flag_clear(unsigned int flag, struct request_queue *q)
extern int blk_set_preempt_only(struct request_queue *q); extern int blk_set_preempt_only(struct request_queue *q);
extern void blk_clear_preempt_only(struct request_queue *q); extern void blk_clear_preempt_only(struct request_queue *q);
static inline int queue_in_flight(struct request_queue *q)
{
return q->in_flight[0] + q->in_flight[1];
}
static inline bool blk_account_rq(struct request *rq) static inline bool blk_account_rq(struct request *rq)
{ {
return (rq->rq_flags & RQF_STARTED) && !blk_rq_is_passthrough(rq); return (rq->rq_flags & RQF_STARTED) && !blk_rq_is_passthrough(rq);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment