Btrfs: use bio_endio_nodec instead of open code

Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
This commit is contained in:
Miao Xie 2014-06-19 10:42:53 +08:00 committed by Chris Mason
parent 298a8f9cf1
commit e990f16763
1 changed files with 1 additions and 8 deletions

View File

@ -5399,12 +5399,6 @@ static void btrfs_end_bio(struct bio *bio, int err)
bio = bbio->orig_bio; bio = bbio->orig_bio;
} }
/*
* We have original bio now. So increment bi_remaining to
* account for it in endio
*/
atomic_inc(&bio->bi_remaining);
bio->bi_private = bbio->private; bio->bi_private = bbio->private;
bio->bi_end_io = bbio->end_io; bio->bi_end_io = bbio->end_io;
btrfs_io_bio(bio)->mirror_num = bbio->mirror_num; btrfs_io_bio(bio)->mirror_num = bbio->mirror_num;
@ -5422,8 +5416,7 @@ static void btrfs_end_bio(struct bio *bio, int err)
err = 0; err = 0;
} }
kfree(bbio); kfree(bbio);
bio_endio_nodec(bio, err);
bio_endio(bio, err);
} else if (!is_orig_bio) { } else if (!is_orig_bio) {
bio_put(bio); bio_put(bio);
} }