diff options
author | Jens Axboe <jens.axboe@oracle.com> | 2008-01-31 06:36:19 -0500 |
---|---|---|
committer | Jens Axboe <jens.axboe@oracle.com> | 2008-02-01 03:26:33 -0500 |
commit | 22b132102f1540dd40f3e41df88796829b685f1a (patch) | |
tree | 20edc8316009b946ebd197b7aef7ccc041d02798 /block/blk-core.c | |
parent | 640e248e44e2c550473550ca83668ceccad21dce (diff) |
block: new end request handling interface should take unsigned byte counts
No point in passing signed integers as the byte count, they can never
be negative.
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-core.c')
-rw-r--r-- | block/blk-core.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/block/blk-core.c b/block/blk-core.c index 8ff99440ee44..55cf293d907d 100644 --- a/block/blk-core.c +++ b/block/blk-core.c | |||
@@ -1846,8 +1846,9 @@ EXPORT_SYMBOL(end_request); | |||
1846 | * 0 - we are done with this request | 1846 | * 0 - we are done with this request |
1847 | * 1 - this request is not freed yet, it still has pending buffers. | 1847 | * 1 - this request is not freed yet, it still has pending buffers. |
1848 | **/ | 1848 | **/ |
1849 | static int blk_end_io(struct request *rq, int error, int nr_bytes, | 1849 | static int blk_end_io(struct request *rq, int error, unsigned int nr_bytes, |
1850 | int bidi_bytes, int (drv_callback)(struct request *)) | 1850 | unsigned int bidi_bytes, |
1851 | int (drv_callback)(struct request *)) | ||
1851 | { | 1852 | { |
1852 | struct request_queue *q = rq->q; | 1853 | struct request_queue *q = rq->q; |
1853 | unsigned long flags = 0UL; | 1854 | unsigned long flags = 0UL; |
@@ -1889,7 +1890,7 @@ static int blk_end_io(struct request *rq, int error, int nr_bytes, | |||
1889 | * 0 - we are done with this request | 1890 | * 0 - we are done with this request |
1890 | * 1 - still buffers pending for this request | 1891 | * 1 - still buffers pending for this request |
1891 | **/ | 1892 | **/ |
1892 | int blk_end_request(struct request *rq, int error, int nr_bytes) | 1893 | int blk_end_request(struct request *rq, int error, unsigned int nr_bytes) |
1893 | { | 1894 | { |
1894 | return blk_end_io(rq, error, nr_bytes, 0, NULL); | 1895 | return blk_end_io(rq, error, nr_bytes, 0, NULL); |
1895 | } | 1896 | } |
@@ -1908,7 +1909,7 @@ EXPORT_SYMBOL_GPL(blk_end_request); | |||
1908 | * 0 - we are done with this request | 1909 | * 0 - we are done with this request |
1909 | * 1 - still buffers pending for this request | 1910 | * 1 - still buffers pending for this request |
1910 | **/ | 1911 | **/ |
1911 | int __blk_end_request(struct request *rq, int error, int nr_bytes) | 1912 | int __blk_end_request(struct request *rq, int error, unsigned int nr_bytes) |
1912 | { | 1913 | { |
1913 | if (blk_fs_request(rq) || blk_pc_request(rq)) { | 1914 | if (blk_fs_request(rq) || blk_pc_request(rq)) { |
1914 | if (__end_that_request_first(rq, error, nr_bytes)) | 1915 | if (__end_that_request_first(rq, error, nr_bytes)) |
@@ -1937,8 +1938,8 @@ EXPORT_SYMBOL_GPL(__blk_end_request); | |||
1937 | * 0 - we are done with this request | 1938 | * 0 - we are done with this request |
1938 | * 1 - still buffers pending for this request | 1939 | * 1 - still buffers pending for this request |
1939 | **/ | 1940 | **/ |
1940 | int blk_end_bidi_request(struct request *rq, int error, int nr_bytes, | 1941 | int blk_end_bidi_request(struct request *rq, int error, unsigned int nr_bytes, |
1941 | int bidi_bytes) | 1942 | unsigned int bidi_bytes) |
1942 | { | 1943 | { |
1943 | return blk_end_io(rq, error, nr_bytes, bidi_bytes, NULL); | 1944 | return blk_end_io(rq, error, nr_bytes, bidi_bytes, NULL); |
1944 | } | 1945 | } |
@@ -1969,7 +1970,8 @@ EXPORT_SYMBOL_GPL(blk_end_bidi_request); | |||
1969 | * this request still has pending buffers or | 1970 | * this request still has pending buffers or |
1970 | * the driver doesn't want to finish this request yet. | 1971 | * the driver doesn't want to finish this request yet. |
1971 | **/ | 1972 | **/ |
1972 | int blk_end_request_callback(struct request *rq, int error, int nr_bytes, | 1973 | int blk_end_request_callback(struct request *rq, int error, |
1974 | unsigned int nr_bytes, | ||
1973 | int (drv_callback)(struct request *)) | 1975 | int (drv_callback)(struct request *)) |
1974 | { | 1976 | { |
1975 | return blk_end_io(rq, error, nr_bytes, 0, drv_callback); | 1977 | return blk_end_io(rq, error, nr_bytes, 0, drv_callback); |