Commit 7b8731d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.9-2020-09-11' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - Fix a regression in bdev partition locking (Christoph)

 - NVMe pull request from Christoph:
      - cancel async events before freeing them (David Milburn)
      - revert a broken race fix (James Smart)
      - fix command processing during resets (Sagi Grimberg)

 - Fix a kyber crash with requeued flushes (Omar)

 - Fix __bio_try_merge_page() same_page error for no merging (Ritesh)

* tag 'block-5.9-2020-09-11' of git://git.kernel.dk/linux-block:
  block: Set same_page to false in __bio_try_merge_page if ret is false
  nvme-fabrics: allow to queue requests for live queues
  block: only call sched requeue_request() for scheduled requests
  nvme-tcp: cancel async events before freeing event struct
  nvme-rdma: cancel async events before freeing event struct
  nvme-fc: cancel async events before freeing event struct
  nvme: Revert: Fix controller creation races with teardown flow
  block: restore a specific error code in bdev_del_partition
parents e8878ab8 fd04358e

block/bfq-iosched.c

+0 −12
Original line number Diff line number Diff line
@@ -5895,18 +5895,6 @@ static void bfq_finish_requeue_request(struct request *rq) 
	struct bfq_queue *bfqq = RQ_BFQQ(rq);

	struct bfq_data *bfqd;



	/*

	 * Requeue and finish hooks are invoked in blk-mq without

	 * checking whether the involved request is actually still

	 * referenced in the scheduler. To handle this fact, the

	 * following two checks make this function exit in case of

	 * spurious invocations, for which there is nothing to do.

	 *

	 * First, check whether rq has nothing to do with an elevator.

	 */

	if (unlikely(!(rq->rq_flags & RQF_ELVPRIV)))

		return;



	/*

	 * rq either is not associated with any icq, or is an already

	 * requeued request that has not (yet) been re-inserted into

block/bio.c

+3 −1
Original line number Diff line number Diff line
@@ -879,8 +879,10 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, 
		struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1];



		if (page_is_mergeable(bv, page, len, off, same_page)) {

			if (bio->bi_iter.bi_size > UINT_MAX - len)

			if (bio->bi_iter.bi_size > UINT_MAX - len) {

				*same_page = false;

				return false;

			}

			bv->bv_len += len;

			bio->bi_iter.bi_size += len;

			return true;

block/blk-mq-sched.h

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ static inline void blk_mq_sched_requeue_request(struct request *rq) 
	struct request_queue *q = rq->q;

	struct elevator_queue *e = q->elevator;



	if (e && e->type->ops.requeue_request)

	if ((rq->rq_flags & RQF_ELVPRIV) && e && e->type->ops.requeue_request)

		e->type->ops.requeue_request(rq);

}

block/partitions/core.c

+1 −1
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ int bdev_del_partition(struct block_device *bdev, int partno) 


	bdevp = bdget_disk(bdev->bd_disk, partno);

	if (!bdevp)

		return -ENOMEM;

		return -ENXIO;



	mutex_lock(&bdevp->bd_mutex);

	mutex_lock_nested(&bdev->bd_mutex, 1);

drivers/nvme/host/core.c

+0 −5
Original line number Diff line number Diff line
@@ -3525,10 +3525,6 @@ static ssize_t nvme_sysfs_delete(struct device *dev, 
{

	struct nvme_ctrl *ctrl = dev_get_drvdata(dev);



	/* Can't delete non-created controllers */

	if (!ctrl->created)

		return -EBUSY;



	if (device_remove_file_self(dev, attr))

		nvme_delete_ctrl_sync(ctrl);

	return count;
@@ -4403,7 +4399,6 @@ void nvme_start_ctrl(struct nvme_ctrl *ctrl) 
		nvme_queue_scan(ctrl);

		nvme_start_queues(ctrl);

	}

	ctrl->created = true;

}

EXPORT_SYMBOL_GPL(nvme_start_ctrl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE