Commit b9889768 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.17-2022-02-17' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Surprise removal fix (Christoph)

 - Ensure that pages are zeroed before submitted for userspace IO
   (Haimin)

 - Fix blk-wbt accounting issue with BFQ (Laibin)

 - Use bsize for discard granularity in loop (Ming)

 - Fix missing zone handling in blk_complete_request() (Pankaj)

* tag 'block-5.17-2022-02-17' of git://git.kernel.dk/linux-block:
  block/wbt: fix negative inflight counter when remove scsi device
  block: fix surprise removal for drivers calling blk_set_queue_dying
  block-map: add __GFP_ZERO flag for alloc_page in function bio_copy_kern
  block: loop:use kstatfs.f_bsize of backing file to set discard granularity
  block: Add handling for zone append command in blk_complete_request
parents 2848551b e92bc4cd

block/bfq-iosched.c

+2 −0
Original line number Diff line number Diff line
@@ -7018,6 +7018,8 @@ static void bfq_exit_queue(struct elevator_queue *e) 
	spin_unlock_irq(&bfqd->lock);

#endif



	wbt_enable_default(bfqd->queue);



	kfree(bfqd);

}

block/blk-core.c

+2 −8
Original line number Diff line number Diff line
@@ -284,13 +284,6 @@ void blk_queue_start_drain(struct request_queue *q) 
	wake_up_all(&q->mq_freeze_wq);

}



void blk_set_queue_dying(struct request_queue *q)

{

	blk_queue_flag_set(QUEUE_FLAG_DYING, q);

	blk_queue_start_drain(q);

}

EXPORT_SYMBOL_GPL(blk_set_queue_dying);



/**

 * blk_cleanup_queue - shutdown a request queue

 * @q: request queue to shutdown
@@ -308,7 +301,8 @@ void blk_cleanup_queue(struct request_queue *q) 
	WARN_ON_ONCE(blk_queue_registered(q));



	/* mark @q DYING, no new request or merges will be allowed afterwards */

	blk_set_queue_dying(q);

	blk_queue_flag_set(QUEUE_FLAG_DYING, q);

	blk_queue_start_drain(q);



	blk_queue_flag_set(QUEUE_FLAG_NOMERGES, q);

	blk_queue_flag_set(QUEUE_FLAG_NOXMERGES, q);

block/blk-map.c

+1 −1
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ static struct bio *bio_copy_kern(struct request_queue *q, void *data, 
		if (bytes > len)

			bytes = len;



		page = alloc_page(GFP_NOIO | gfp_mask);

		page = alloc_page(GFP_NOIO | __GFP_ZERO | gfp_mask);

		if (!page)

			goto cleanup;

block/blk-mq.c

+4 −0
Original line number Diff line number Diff line
@@ -736,6 +736,10 @@ static void blk_complete_request(struct request *req) 


		/* Completion has already been traced */

		bio_clear_flag(bio, BIO_TRACE_COMPLETION);



		if (req_op(req) == REQ_OP_ZONE_APPEND)

			bio->bi_iter.bi_sector = req->__sector;



		if (!is_flush)

			bio_endio(bio);

		bio = next;

block/elevator.c

+0 −2
Original line number Diff line number Diff line
@@ -525,8 +525,6 @@ void elv_unregister_queue(struct request_queue *q) 
		kobject_del(&e->kobj);



		e->registered = 0;

		/* Re-enable throttling in case elevator disabled it */

		wbt_enable_default(q);

	}

}