Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bc1e79ac authored by Kent Overstreet's avatar Kent Overstreet Committed by Jens Axboe
Browse files

block: fixup for generic bio chaining 



btrfs bits got lost in the rebase

Signed-off-by: default avatarKent Overstreet <kmo@daterainc.com>
Cc: Chris Mason <clm@fb.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 2b8221e1

fs/btrfs/disk-io.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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)

fs/btrfs/volumes.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -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;