Commit 29206c63 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-5.8-2020-07-05' of git://git.kernel.dk/linux-block 

Pull block fixes from Jens Axboe:

 - NVMe fixes from Christoph:
    - Fix crash in multi-path disk add (Christoph)
    - Fix ignore of identify error (Sagi)

 - Fix a compiler complaint that a function should be static (Wei)

* tag 'block-5.8-2020-07-05' of git://git.kernel.dk/linux-block:
  block: make function __bio_integrity_free() static
  nvme: fix a crash in nvme_mpath_add_disk
  nvme: fix identify error status silent ignore
parents 9fbe565c 3197d48a

block/bio-integrity.c

+2 −1
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ void blk_flush_integrity(void) 
	flush_workqueue(kintegrityd_wq);

}



void __bio_integrity_free(struct bio_set *bs, struct bio_integrity_payload *bip)

static void __bio_integrity_free(struct bio_set *bs,

				 struct bio_integrity_payload *bip)

{

	if (bs && mempool_initialized(&bs->bio_integrity_pool)) {

		if (bip->bip_vec)

drivers/nvme/host/core.c

+9 −3
Original line number Diff line number Diff line
@@ -1116,10 +1116,16 @@ static int nvme_identify_ns_descs(struct nvme_ctrl *ctrl, unsigned nsid, 
		dev_warn(ctrl->device,

			"Identify Descriptors failed (%d)\n", status);

		 /*

		  * Don't treat an error as fatal, as we potentially already

		  * have a NGUID or EUI-64.

		  * Don't treat non-retryable errors as fatal, as we potentially

		  * already have a NGUID or EUI-64.  If we failed with DNR set,

		  * we want to silently ignore the error as we can still

		  * identify the device, but if the status has DNR set, we want

		  * to propagate the error back specifically for the disk

		  * revalidation flow to make sure we don't abandon the

		  * device just because of a temporal retry-able error (such

		  * as path of transport errors).

		  */

		if (status > 0 && !(status & NVME_SC_DNR))

		if (status > 0 && (status & NVME_SC_DNR))

			status = 0;

		goto free_data;

	}

drivers/nvme/host/multipath.c

+4 −3
Original line number Diff line number Diff line
@@ -672,10 +672,11 @@ void nvme_mpath_add_disk(struct nvme_ns *ns, struct nvme_id_ns *id) 
	}



	if (bdi_cap_stable_pages_required(ns->queue->backing_dev_info)) {

		struct backing_dev_info *info =

					ns->head->disk->queue->backing_dev_info;

		struct gendisk *disk = ns->head->disk;



		info->capabilities |= BDI_CAP_STABLE_WRITES;

		if (disk)

			disk->queue->backing_dev_info->capabilities |=

					BDI_CAP_STABLE_WRITES;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE