Skip to content

Commit

Permalink
Btrfs: use bio_endio_nodec instead of open code
Browse files Browse the repository at this point in the history
Signed-off-by: Miao Xie <miaox@cn.fujitsu.com>
Signed-off-by: Chris Mason <clm@fb.com>
  • Loading branch information
Miao Xie authored and Chris Mason committed Jun 19, 2014
1 parent 298a8f9 commit e990f16
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions fs/btrfs/volumes.c
Original file line number Diff line number Diff line change
Expand Up @@ -5399,12 +5399,6 @@ static void btrfs_end_bio(struct bio *bio, int err)
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_end_io = bbio->end_io;
btrfs_io_bio(bio)->mirror_num = bbio->mirror_num;
Expand All @@ -5422,8 +5416,7 @@ static void btrfs_end_bio(struct bio *bio, int err)
err = 0;
}
kfree(bbio);

bio_endio(bio, err);
bio_endio_nodec(bio, err);
} else if (!is_orig_bio) {
bio_put(bio);
}
Expand Down

0 comments on commit e990f16

Please sign in to comment.