mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-31 04:01:48 -04:00
Drop 'size' argument from bio_endio and bi_end_io
As bi_end_io is only called once when the reqeust is complete, the 'size' argument is now redundant. Remove it. Now there is no need for bio_endio to subtract the size completed from bi_size. So don't do that either. While we are at it, change bi_end_io to return void. Signed-off-by: Neil Brown <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
5bb23a688b
commit
6712ecf8f6
45 changed files with 132 additions and 328 deletions
|
|
@ -2200,16 +2200,13 @@ static int lbmIOWait(struct lbuf * bp, int flag)
|
|||
*
|
||||
* executed at INTIODONE level
|
||||
*/
|
||||
static int lbmIODone(struct bio *bio, unsigned int bytes_done, int error)
|
||||
static void lbmIODone(struct bio *bio, int error)
|
||||
{
|
||||
struct lbuf *bp = bio->bi_private;
|
||||
struct lbuf *nextbp, *tail;
|
||||
struct jfs_log *log;
|
||||
unsigned long flags;
|
||||
|
||||
if (bio->bi_size)
|
||||
return 1;
|
||||
|
||||
/*
|
||||
* get back jfs buffer bound to the i/o buffer
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -280,14 +280,10 @@ static void last_read_complete(struct page *page)
|
|||
unlock_page(page);
|
||||
}
|
||||
|
||||
static int metapage_read_end_io(struct bio *bio, unsigned int bytes_done,
|
||||
int err)
|
||||
static void metapage_read_end_io(struct bio *bio, int err)
|
||||
{
|
||||
struct page *page = bio->bi_private;
|
||||
|
||||
if (bio->bi_size)
|
||||
return 1;
|
||||
|
||||
if (!test_bit(BIO_UPTODATE, &bio->bi_flags)) {
|
||||
printk(KERN_ERR "metapage_read_end_io: I/O error\n");
|
||||
SetPageError(page);
|
||||
|
|
@ -341,16 +337,12 @@ static void last_write_complete(struct page *page)
|
|||
end_page_writeback(page);
|
||||
}
|
||||
|
||||
static int metapage_write_end_io(struct bio *bio, unsigned int bytes_done,
|
||||
int err)
|
||||
static void metapage_write_end_io(struct bio *bio, int err)
|
||||
{
|
||||
struct page *page = bio->bi_private;
|
||||
|
||||
BUG_ON(!PagePrivate(page));
|
||||
|
||||
if (bio->bi_size)
|
||||
return 1;
|
||||
|
||||
if (! test_bit(BIO_UPTODATE, &bio->bi_flags)) {
|
||||
printk(KERN_ERR "metapage_write_end_io: I/O error\n");
|
||||
SetPageError(page);
|
||||
|
|
|
|||
Loading…
Reference in a new issue