iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

block: fixup for generic bio chaining

Browse Source 
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>
This commit is contained in:
Kent Overstreet 2013-12-03 13:24:08 -08:00 committed by Jens Axboe
parent 2b8221e181
commit bc1e79acc1
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/btrfs/disk-io.c
View File

@ -1692,7 +1692,7 @@ static void end_workqueue_fn(struct btrfs_work *work)
bio->bi_private = end_io_wq->private; bio->bi_private = end_io_wq->private;
bio->bi_end_io = end_io_wq->end_io; bio->bi_end_io = end_io_wq->end_io;
kfree(end_io_wq); kfree(end_io_wq);
bio_endio(bio, error); bio_endio_nodec(bio, error);
} }
static int cleaner_kthread(void *arg) static int cleaner_kthread(void *arg)

2
fs/btrfs/volumes.c
View File

@ -5297,6 +5297,8 @@ static void btrfs_end_bio(struct bio *bio, int err)
if (!is_orig_bio) { if (!is_orig_bio) {
bio_put(bio); bio_put(bio);
bio = bbio->orig_bio; bio = bbio->orig_bio;
} else {
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;