|
@@ -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)
|
|
__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)
|
|
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);
|