From: Christoph Hellwig <hch@lst.de>
To: Jens Axboe <axboe@kernel.dk>
Cc: linux-kernel@vger.kernel.org
Subject: block: remove REQ_ATOM_COMPLETE wrappers
Date: Mon, 16 Jun 2014 17:59:16 +0200 [thread overview]
Message-ID: <20140616155916.GA19234@lst.de> (raw)
Just opencoding the bitops makes it much easier to grep for it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
diff --git a/block/blk-core.c b/block/blk-core.c
index 9aca8c7..fca5009 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -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))
diff --git a/block/blk-flush.c b/block/blk-flush.c
index 8ffee4b..3c12f26 100644
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -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)
diff --git a/block/blk-mq.c b/block/blk-mq.c
index e11f5f8..3d868d3 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -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);
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 53b1737..5144e84 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -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);
diff --git a/block/blk-timeout.c b/block/blk-timeout.c
index 95a0959..185ebbe 100644
--- a/block/blk-timeout.c
+++ b/block/blk-timeout.c
@@ -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);
diff --git a/block/blk.h b/block/blk.h
index 45385e9..91f67e7 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -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)
reply other threads:[~2014-06-16 15:59 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140616155916.GA19234@lst.de \
--to=hch@lst.de \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox