From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 5 Apr 2018 21:27:02 +0000 (-0700)
Subject: Merge tag 'for-4.17/block-20180402' of git://git.kernel.dk/linux-block
X-Git-Tag: v4.19~1291
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3526dd0c7832f1011a0477cc6d903662bae05ea8;p=platform%2Fkernel%2Flinux-rpi3.git

Merge tag 'for-4.17/block-20180402' of git://git.kernel.dk/linux-block

Pull block layer updates from Jens Axboe:
 "It's a pretty quiet round this time, which is nice. This contains:

   - series from Bart, cleaning up the way we set/test/clear atomic
     queue flags.

   - series from Bart, fixing races between gendisk and queue
     registration and removal.

   - set of bcache fixes and improvements from various folks, by way of
     Michael Lyle.

   - set of lightnvm updates from Matias, most of it being the 1.2 to
     2.0 transition.

   - removal of unused DIO flags from Nikolay.

   - blk-mq/sbitmap memory ordering fixes from Omar.

   - divide-by-zero fix for BFQ from Paolo.

   - minor documentation patches from Randy.

   - timeout fix from Tejun.

   - Alpha "can't write a char atomically" fix from Mikulas.

   - set of NVMe fixes by way of Keith.

   - bsg and bsg-lib improvements from Christoph.

   - a few sed-opal fixes from Jonas.

   - cdrom check-disk-change deadlock fix from Maurizio.

   - various little fixes, comment fixes, etc from various folks"

* tag 'for-4.17/block-20180402' of git://git.kernel.dk/linux-block: (139 commits)
  blk-mq: Directly schedule q->timeout_work when aborting a request
  blktrace: fix comment in blktrace_api.h
  lightnvm: remove function name in strings
  lightnvm: pblk: remove some unnecessary NULL checks
  lightnvm: pblk: don't recover unwritten lines
  lightnvm: pblk: implement 2.0 support
  lightnvm: pblk: implement get log report chunk
  lightnvm: pblk: rename ppaf* to addrf*
  lightnvm: pblk: check for supported version
  lightnvm: implement get log report chunk helpers
  lightnvm: make address conversions depend on generic device
  lightnvm: add support for 2.0 address format
  lightnvm: normalize geometry nomenclature
  lightnvm: complete geo structure with maxoc*
  lightnvm: add shorten OCSSD version in geo
  lightnvm: add minor version to generic geometry
  lightnvm: simplify geometry structure
  lightnvm: pblk: refactor init/exit sequences
  lightnvm: Avoid validation of default op value
  lightnvm: centralize permission check for lightnvm ioctl
  ...
---

3526dd0c7832f1011a0477cc6d903662bae05ea8
diff --cc drivers/nvdimm/btt.c
index 4b95ac5,6f311f8..85de805
--- a/drivers/nvdimm/btt.c
+++ b/drivers/nvdimm/btt.c
@@@ -1542,9 -1542,11 +1542,9 @@@ static int btt_blk_init(struct btt *btt
  	blk_queue_make_request(btt->btt_queue, btt_make_request);
  	blk_queue_logical_block_size(btt->btt_queue, btt->sector_size);
  	blk_queue_max_hw_sectors(btt->btt_queue, UINT_MAX);
- 	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, btt->btt_queue);
+ 	blk_queue_flag_set(QUEUE_FLAG_NONROT, btt->btt_queue);
  	btt->btt_queue->queuedata = btt;
  
 -	set_capacity(btt->btt_disk, 0);
 -	device_add_disk(&btt->nd_btt->dev, btt->btt_disk);
  	if (btt_meta_size(btt)) {
  		int rc = nd_integrity_init(btt->btt_disk, btt_meta_size(btt));
  
diff --cc drivers/nvme/host/core.c
index 7aeca5d,f81e3b3..197a6ba
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@@ -3033,6 -3052,8 +3052,7 @@@ static void nvme_alloc_ns(struct nvme_c
  			ns->disk->disk_name);
  
  	nvme_mpath_add_disk(ns->head);
 -	nvme_mpath_add_disk_links(ns);
+ 	nvme_fault_inject_init(ns);
  	return;
   out_unlink_ns:
  	mutex_lock(&ctrl->subsys->lock);
@@@ -3051,7 -3072,9 +3071,8 @@@ static void nvme_ns_remove(struct nvme_
  	if (test_and_set_bit(NVME_NS_REMOVING, &ns->flags))
  		return;
  
+ 	nvme_fault_inject_fini(ns);
  	if (ns->disk && ns->disk->flags & GENHD_FL_UP) {
 -		nvme_mpath_remove_disk_links(ns);
  		sysfs_remove_group(&disk_to_dev(ns->disk)->kobj,
  					&nvme_ns_id_attr_group);
  		if (ns->ndev)