block: remove REQ_ATOM_COMPLETE wrappers
Just opencoding the bitops makes it much easier to grep for it.
Signed-off-by Christoph Hellwig <[email protected]>
block/blk-core.c +1 -1
@@ -1265,7 +1265,7 @@ EXPORT_SYMBOL(blk_rq_set_block_pc);void blk_requeue_request (struct request_queue *q,struct request *rq) {blk_delete_timer (rq); -blk_clear_rq_complete (rq); +clear_bit (REQ_ATOM_COMPLETE , &rq->atomic_flags);trace_block_rq_requeue (q, rq);if (blk_rq_tagged (rq))
block/blk-flush.c +1 -1
@@ -127,7 +127,7 @@ static void blk_flush_restore_request(struct request *rq) rq->cmd_flags &= ~REQ_FLUSH_SEQ ; rq->end_io = rq->flush.saved_end_io; -blk_clear_rq_complete (rq); +clear_bit (REQ_ATOM_COMPLETE , &rq->atomic_flags); }static bool blk_flush_queue_rq (struct request *rq,bool add_front)
block/blk-mq.c +2 -2
@@ -396,7 +396,7 @@ void blk_mq_complete_request(struct request *rq)if (unlikely (blk_should_fake_timeout (q)))return ; -if (!blk_mark_rq_complete (rq)) +if (!test_and_set_bit (REQ_ATOM_COMPLETE , &rq->atomic_flags))__blk_mq_complete_request (rq); }EXPORT_SYMBOL (blk_mq_complete_request);
@@ -460,7 +460,7 @@ static void __blk_mq_requeue_request(struct request *rq)void blk_mq_requeue_request (struct request *rq) {__blk_mq_requeue_request (rq); -blk_clear_rq_complete (rq); +clear_bit (REQ_ATOM_COMPLETE , &rq->atomic_flags);BUG_ON (blk_queued_rq (rq));blk_mq_add_to_requeue_list (rq, true);
block/blk-softirq.c +1 -1
@@ -167,7 +167,7 @@ void blk_complete_request(struct request *req) {if (unlikely (blk_should_fake_timeout (req->q)))return ; -if (!blk_mark_rq_complete (req)) +if (!test_and_set_bit (REQ_ATOM_COMPLETE , &req->atomic_flags))__blk_complete_request (req); }EXPORT_SYMBOL (blk_complete_request);
block/blk-timeout.c +3 -3
@@ -97,7 +97,7 @@ static void blk_rq_timed_out(struct request *req)break ;case BLK_EH_RESET_TIMER :blk_add_timer (req); -blk_clear_rq_complete (req); +clear_bit (REQ_ATOM_COMPLETE , &req->atomic_flags);break ;case BLK_EH_NOT_HANDLED :/*
@@ -122,7 +122,7 @@ void blk_rq_check_expired(struct request *rq, unsigned long *next_timeout,/* * Check if we raced with end io completion */ -if (!blk_mark_rq_complete (rq)) +if (!test_and_set_bit (REQ_ATOM_COMPLETE , &rq->atomic_flags))blk_rq_timed_out (rq); }else if (!*next_set ||time_after (*next_timeout, rq->deadline)) { *next_timeout = rq->deadline;
@@ -159,7 +159,7 @@ void blk_rq_timed_out_timer(unsigned long data)*/ void blk_abort_request (struct request *req) { -if (blk_mark_rq_complete (req)) +if (test_and_set_bit (REQ_ATOM_COMPLETE , &req->atomic_flags))return ;blk_delete_timer (req);blk_rq_timed_out (req);
block/blk.h +0 -14
@@ -65,20 +65,6 @@ enum rq_atomic_flags { };/* -* EH timer and IO completion will both attempt to 'grab' the request, make -* sure that only one of them succeeds -*/ -static inline int blk_mark_rq_complete (struct request *rq) -{ -return test_and_set_bit (REQ_ATOM_COMPLETE , &rq->atomic_flags); -} - -static inline void blk_clear_rq_complete (struct request *rq) -{ -clear_bit (REQ_ATOM_COMPLETE , &rq->atomic_flags); -} - -/* * Internal elevator interface */ #define ELV_ON_HASH (rq) ((rq)->cmd_flags & REQ_HASHED)