diff options
| author | Tejun Heo <tj@kernel.org> | 2009-04-28 00:06:04 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-04-28 02:14:49 -0400 |
| commit | 9fd8d0e1bcb848257968d9a7d73ca4d890ea8bd1 (patch) | |
| tree | 6ecdb8af44feda12713c1bee34a1ad5e9e978ee8 /include/linux | |
| parent | 9eb55b030c4b3227334ee4482402096cd1d1a6fe (diff) | |
block: make blk_end_request_cur() return bool
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>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | 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 12c545e2737c..3a5b1bd6582c 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) | |||
| 903 | * | 903 | * |
| 904 | * Description: | 904 | * Description: |
| 905 | * Complete the current consecutively mapped chunk from @rq. | 905 | * Complete the current consecutively mapped chunk from @rq. |
| 906 | * | ||
| 907 | * Return: | ||
| 908 | * %false - we are done with this request | ||
| 909 | * %true - still buffers pending for this request | ||
| 906 | */ | 910 | */ |
| 907 | static inline void blk_end_request_cur(struct request *rq, int error) | 911 | static inline bool blk_end_request_cur(struct request *rq, int error) |
| 908 | { | 912 | { |
| 909 | blk_end_request(rq, error, rq->hard_cur_sectors << 9); | 913 | return blk_end_request(rq, error, rq->hard_cur_sectors << 9); |
| 910 | } | 914 | } |
| 911 | 915 | ||
| 912 | /** | 916 | /** |
| @@ -952,10 +956,14 @@ static inline void __blk_end_request_all(struct request *rq, int error) | |||
| 952 | * Description: | 956 | * Description: |
| 953 | * Complete the current consecutively mapped chunk from @rq. Must | 957 | * Complete the current consecutively mapped chunk from @rq. Must |
| 954 | * be called with queue lock held. | 958 | * be called with queue lock held. |
| 959 | * | ||
| 960 | * Return: | ||
| 961 | * %false - we are done with this request | ||
| 962 | * %true - still buffers pending for this request | ||
| 955 | */ | 963 | */ |
| 956 | static inline void __blk_end_request_cur(struct request *rq, int error) | 964 | static inline bool __blk_end_request_cur(struct request *rq, int error) |
| 957 | { | 965 | { |
| 958 | __blk_end_request(rq, error, rq->hard_cur_sectors << 9); | 966 | return __blk_end_request(rq, error, rq->hard_cur_sectors << 9); |
| 959 | } | 967 | } |
| 960 | 968 | ||
| 961 | extern void blk_complete_request(struct request *); | 969 | extern void blk_complete_request(struct request *); |
