Commit 8467f9e3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.18-2022-04-22' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:
 "Just two small regression fixes for bcache"

* tag 'block-5.18-2022-04-22' of git://git.kernel.dk/linux-block:
  bcache: fix wrong bdev parameter when calling bio_alloc_clone() in do_bio_hook()
  bcache: put bch_bio_map() back to correct location in journal_write_unlocked()
parents 1f5e98e7 9dca4168

drivers/md/bcache/journal.c

+1 −1
Original line number Diff line number Diff line
@@ -771,12 +771,12 @@ static void journal_write_unlocked(struct closure *cl) 


		bio_reset(bio, ca->bdev, REQ_OP_WRITE | 

			  REQ_SYNC | REQ_META | REQ_PREFLUSH | REQ_FUA);

		bch_bio_map(bio, w->data);

		bio->bi_iter.bi_sector	= PTR_OFFSET(k, i);

		bio->bi_iter.bi_size = sectors << 9;



		bio->bi_end_io	= journal_write_endio;

		bio->bi_private = w;

		bch_bio_map(bio, w->data);



		trace_bcache_journal_write(bio, w->data->keys);

		bio_list_add(&list, bio);

drivers/md/bcache/request.c

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ static void do_bio_hook(struct search *s, 
{

	struct bio *bio = &s->bio.bio;



	bio_init_clone(bio->bi_bdev, bio, orig_bio, GFP_NOIO);

	bio_init_clone(orig_bio->bi_bdev, bio, orig_bio, GFP_NOIO);

	/*

	 * bi_end_io can be set separately somewhere else, e.g. the

	 * variants in,