diff options
author | Miao Xie <miaox@cn.fujitsu.com> | 2014-06-18 22:42:53 -0400 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2014-06-19 17:20:55 -0400 |
commit | e990f16763abad35dd4d0eec791bab37c6987724 (patch) | |
tree | 0702ad83275665266be447d8532f0f39ab4f30d9 /fs/btrfs | |
parent | 298a8f9cf17d2f2e1ffc41e5e247fa3695a8a76f (diff) |
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>
Diffstat (limited to 'fs/btrfs')
-rw-r--r-- | fs/btrfs/volumes.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 19c298a47a6f..31f9036f3171 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c | |||
@@ -5399,12 +5399,6 @@ static void btrfs_end_bio(struct bio *bio, int err) | |||
5399 | bio = bbio->orig_bio; | 5399 | bio = bbio->orig_bio; |
5400 | } | 5400 | } |
5401 | 5401 | ||
5402 | /* | ||
5403 | * We have original bio now. So increment bi_remaining to | ||
5404 | * account for it in endio | ||
5405 | */ | ||
5406 | atomic_inc(&bio->bi_remaining); | ||
5407 | |||
5408 | bio->bi_private = bbio->private; | 5402 | bio->bi_private = bbio->private; |
5409 | bio->bi_end_io = bbio->end_io; | 5403 | bio->bi_end_io = bbio->end_io; |
5410 | btrfs_io_bio(bio)->mirror_num = bbio->mirror_num; | 5404 | btrfs_io_bio(bio)->mirror_num = bbio->mirror_num; |
@@ -5422,8 +5416,7 @@ static void btrfs_end_bio(struct bio *bio, int err) | |||
5422 | err = 0; | 5416 | err = 0; |
5423 | } | 5417 | } |
5424 | kfree(bbio); | 5418 | kfree(bbio); |
5425 | 5419 | bio_endio_nodec(bio, err); | |
5426 | bio_endio(bio, err); | ||
5427 | } else if (!is_orig_bio) { | 5420 | } else if (!is_orig_bio) { |
5428 | bio_put(bio); | 5421 | bio_put(bio); |
5429 | } | 5422 | } |