From: Tejun Heo <tj@kernel.org>
To: axboe@kernel.dk, linux-kernel@vger.kernel.org,
donari75@gmail.com, bzolnier@gmail.com, joerg@dorchain.net,
geert@linux-m68k.org, davem@davemloft.net, jdike@linux.intel.com,
benh@kernel.crashing.org, Laurent@lvivier.info
Cc: Tejun Heo <tj@kernel.org>
Subject: [PATCH 01/14] block: make blk_end_request_cur() return bool
Date: Tue, 28 Apr 2009 13:06:04 +0900 [thread overview]
Message-ID: <1240891577-4813-2-git-send-email-tj@kernel.org> (raw)
In-Reply-To: <1240891577-4813-1-git-send-email-tj@kernel.org>
In the process of mindlessly copying [__]blk_end_request_all(),
[__]blk_end_request_cur() ended up returning void even though they're
partial completion functions. Fix it.
[ Impact: fix braindead API ]
Signed-off-by: Tejun Heo <tj@kernel.org>
---
include/linux/blkdev.h | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 12c545e..3a5b1bd 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -903,10 +903,14 @@ static inline void blk_end_request_all(struct request *rq, int error)
*
* Description:
* Complete the current consecutively mapped chunk from @rq.
+ *
+ * Return:
+ * %false - we are done with this request
+ * %true - still buffers pending for this request
*/
-static inline void blk_end_request_cur(struct request *rq, int error)
+static inline bool blk_end_request_cur(struct request *rq, int error)
{
- blk_end_request(rq, error, rq->hard_cur_sectors << 9);
+ return blk_end_request(rq, error, rq->hard_cur_sectors << 9);
}
/**
@@ -952,10 +956,14 @@ static inline void __blk_end_request_all(struct request *rq, int error)
* Description:
* Complete the current consecutively mapped chunk from @rq. Must
* be called with queue lock held.
+ *
+ * Return:
+ * %false - we are done with this request
+ * %true - still buffers pending for this request
*/
-static inline void __blk_end_request_cur(struct request *rq, int error)
+static inline bool __blk_end_request_cur(struct request *rq, int error)
{
- __blk_end_request(rq, error, rq->hard_cur_sectors << 9);
+ return __blk_end_request(rq, error, rq->hard_cur_sectors << 9);
}
extern void blk_complete_request(struct request *);
--
1.6.0.2
next prev parent reply other threads:[~2009-04-28 4:08 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-28 4:06 [GIT PATCH linux-2.6-block#for-2.6.31] block: lld cleanup patches, take#2 Tejun Heo
2009-04-28 4:06 ` Tejun Heo [this message]
2009-04-28 4:06 ` [PATCH 02/14] block: don't init rq fields unnecessarily Tejun Heo
2009-04-28 4:06 ` [PATCH 03/14] amiflop,ataflop,xd,mg_disk: clean up unnecessary stuff from block drivers Tejun Heo
2009-04-28 4:06 ` [PATCH 04/14] ps3disk: simplify request completion Tejun Heo
2009-04-28 4:06 ` [PATCH 05/14] sunvdc: kill vdc_end_request() Tejun Heo
2009-04-28 4:06 ` [PATCH 06/14] ubd: cleanup completion path Tejun Heo
2009-04-28 4:06 ` [PATCH 07/14] ubd: drop unnecessary rq->sector manipulation Tejun Heo
2009-04-28 4:06 ` [PATCH 08/14] hd: clean up request completion paths Tejun Heo
2009-04-28 4:06 ` [PATCH 09/14] swim3: " Tejun Heo
2009-04-28 6:44 ` Benjamin Herrenschmidt
2009-04-28 4:06 ` [PATCH 10/14] swim: " Tejun Heo
2009-04-28 4:06 ` [PATCH 11/14] mg_disk: fold mg_disk.h into mg_disk.c Tejun Heo
2009-04-28 4:06 ` [PATCH 12/14] mg_disk: clean up request completion paths Tejun Heo
2009-04-28 4:06 ` [PATCH 13/14] mg_disk: fix dependency on libata Tejun Heo
2009-04-28 4:06 ` [PATCH 14/14] mg_disk: use defines from <linux/ata.h> Tejun Heo
2009-04-28 6:15 ` [GIT PATCH linux-2.6-block#for-2.6.31] block: lld cleanup patches, take#2 Jens Axboe
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=1240891577-4813-2-git-send-email-tj@kernel.org \
--to=tj@kernel.org \
--cc=Laurent@lvivier.info \
--cc=axboe@kernel.dk \
--cc=benh@kernel.crashing.org \
--cc=bzolnier@gmail.com \
--cc=davem@davemloft.net \
--cc=donari75@gmail.com \
--cc=geert@linux-m68k.org \
--cc=jdike@linux.intel.com \
--cc=joerg@dorchain.net \
--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