summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-12-03 13:24:08 -0800
committerJens Axboe <axboe@kernel.dk>2013-12-03 14:30:00 -0700
commitbc1e79acc13d70c5bb1b2a47bf0a580e6ae81fb6 (patch)
treee39de27a6e82fa8eb82e0ef3bf70b27a0bca9c9f /fs
parent2b8221e181c128ac3bc7a9cdc80db04884951e89 (diff)
downloadop-kernel-dev-bc1e79acc13d70c5bb1b2a47bf0a580e6ae81fb6.zip
op-kernel-dev-bc1e79acc13d70c5bb1b2a47bf0a580e6ae81fb6.tar.gz
block: fixup for generic bio chaining
btrfs bits got lost in the rebase Signed-off-by: Kent Overstreet <kmo@daterainc.com> Cc: Chris Mason <clm@fb.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'fs')
-rw-r--r--fs/btrfs/disk-io.c2
-rw-r--r--fs/btrfs/volumes.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 5a10c61..e71039e 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1692,7 +1692,7 @@ static void end_workqueue_fn(struct btrfs_work *work)
bio->bi_private = end_io_wq->private;
bio->bi_end_io = end_io_wq->end_io;
kfree(end_io_wq);
- bio_endio(bio, error);
+ bio_endio_nodec(bio, error);
}
static int cleaner_kthread(void *arg)
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
index f2130de..37972d5 100644
--- a/fs/btrfs/volumes.c
+++ b/fs/btrfs/volumes.c
@@ -5297,6 +5297,8 @@ static void btrfs_end_bio(struct bio *bio, int err)
if (!is_orig_bio) {
bio_put(bio);
bio = bbio->orig_bio;
+ } else {
+ atomic_inc(&bio->bi_remaining);
}
bio->bi_private = bbio->private;
bio->bi_end_io = bbio->end_io;
OpenPOWER on IntegriCloud