Merge tag 'for-linus-20181102' of git://git.kernel.dk/linux-block

Pull block layer fixes from Jens Axboe:
 "The biggest part of this pull request is the revert of the blkcg
  cleanup series. It had one fix earlier for a stacked device issue, but
  another one was reported. Rather than play whack-a-mole with this,
  revert the entire series and try again for the next kernel release.

  Apart from that, only small fixes/changes.

  Summary:

   - Indentation fixup for mtip32xx (Colin Ian King)

   - The blkcg cleanup series revert (Dennis Zhou)

   - Two NVMe fixes. One fixing a regression in the nvme request
     initialization in this merge window, causing nvme-fc to not work.
     The other is a suspend/resume p2p resource issue (James, Keith)

   - Fix sg discard merge, allowing us to merge in cases where we didn't
     before (Jianchao Wang)

   - Call rq_qos_exit() after the queue is frozen, preventing a hang
     (Ming)

   - Fix brd queue setup, fixing an oops if we fail setting up all
     devices (Ming)"

* tag 'for-linus-20181102' of git://git.kernel.dk/linux-block:
  nvme-pci: fix conflicting p2p resource adds
  nvme-fc: fix request private initialization
  blkcg: revert blkcg cleanups series
  block: brd: associate with queue until adding disk
  block: call rq_qos_exit() after queue is frozen
  mtip32xx: clean an indentation issue, remove extraneous tabs
  block: fix the DISCARD request merge

6 files changed, 21 insertions, 13 deletions

diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index df8103dd40ac..c18586fccb6f 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -396,15 +396,14 @@ static struct brd_device *brd_alloc(int i)
         disk->first_minor       = i * max_part;
         disk->fops              = &brd_fops;
         disk->private_data      = brd;
-        disk->queue             = brd->brd_queue;
         disk->flags             = GENHD_FL_EXT_DEVT;
         sprintf(disk->disk_name, "ram%d", i);
         set_capacity(disk, rd_size * 2);
-        disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
+        brd->brd_queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
 
         /* Tell the block layer that this is not a rotational device */
-        blk_queue_flag_set(QUEUE_FLAG_NONROT, disk->queue);
-        blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, disk->queue);
+        blk_queue_flag_set(QUEUE_FLAG_NONROT, brd->brd_queue);
+        blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, brd->brd_queue);
 
         return brd;
 
@@ -436,6 +435,7 @@ static struct brd_device *brd_init_one(int i, bool *new)
 
         brd = brd_alloc(i);
         if (brd) {
+                brd->brd_disk->queue = brd->brd_queue;
                 add_disk(brd->brd_disk);
                 list_add_tail(&brd->brd_list, &brd_devices);
         }
@@ -503,8 +503,14 @@ static int __init brd_init(void)
 
         /* point of no return */
 
-        list_for_each_entry(brd, &brd_devices, brd_list)
+        list_for_each_entry(brd, &brd_devices, brd_list) {
+                /*
+                 * associate with queue just before adding disk for
+                 * avoiding to mess up failure path
+                 */
+                brd->brd_disk->queue = brd->brd_queue;
                 add_disk(brd->brd_disk);
+        }
 
         blk_register_region(MKDEV(RAMDISK_MAJOR, 0), 1UL << MINORBITS,
                                   THIS_MODULE, brd_probe, NULL, NULL);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index e6273ae85246..cb0cc8685076 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -77,7 +77,6 @@
 #include <linux/falloc.h>
 #include <linux/uio.h>
 #include <linux/ioprio.h>
-#include <linux/blk-cgroup.h>
 
 #include "loop.h"
 
@@ -1760,8 +1759,8 @@ static blk_status_t loop_queue_rq(struct blk_mq_hw_ctx *hctx,
 
         /* always use the first bio's css */
 #ifdef CONFIG_BLK_CGROUP
-        if (cmd->use_aio && rq->bio && rq->bio->bi_blkg) {
-                cmd->css = &bio_blkcg(rq->bio)->css;
+        if (cmd->use_aio && rq->bio && rq->bio->bi_css) {
+                cmd->css = rq->bio->bi_css;
                 css_get(cmd->css);
         } else
 #endif
diff --git a/drivers/block/mtip32xx/mtip32xx.c b/drivers/block/mtip32xx/mtip32xx.c
index dfc8de6ce525..a7daa8acbab3 100644
--- a/drivers/block/mtip32xx/mtip32xx.c
+++ b/drivers/block/mtip32xx/mtip32xx.c
@@ -1942,8 +1942,8 @@ static int exec_drive_taskfile(struct driver_data *dd,
                                 dev_warn(&dd->pdev->dev,
                                         "data movement but "
                                         "sect_count is 0\n");
-                                        err = -EINVAL;
-                                        goto abort;
+                                err = -EINVAL;
+                                goto abort;
                         }
                 }
         }
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index f3fb5bb8c82a..ac1cffd2a09b 100644
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -542,7 +542,7 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)
                     !discard_bio)
                         continue;
                 bio_chain(discard_bio, bio);
-                bio_clone_blkg_association(discard_bio, bio);
+                bio_clone_blkcg_association(discard_bio, bio);
                 if (mddev->gendisk)
                         trace_block_bio_remap(bdev_get_queue(rdev->bdev),
                                 discard_bio, disk_devt(mddev->gendisk),
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index e52b9d3c0bd6..0b70c8bab045 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1704,7 +1704,6 @@ __nvme_fc_init_request(struct nvme_fc_ctrl *ctrl,
         op->fcp_req.rspaddr = &op->rsp_iu;
         op->fcp_req.rsplen = sizeof(op->rsp_iu);
         op->fcp_req.done = nvme_fc_fcpio_done;
-        op->fcp_req.private = &op->fcp_req.first_sgl[SG_CHUNK_SIZE];
         op->ctrl = ctrl;
         op->queue = queue;
         op->rq = rq;
@@ -1752,6 +1751,7 @@ nvme_fc_init_request(struct blk_mq_tag_set *set, struct request *rq,
         if (res)
                 return res;
         op->op.fcp_req.first_sgl = &op->sgl[0];
+        op->op.fcp_req.private = &op->priv[0];
         return res;
 }
 
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index f30031945ee4..c33bb201b884 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1663,6 +1663,9 @@ static void nvme_map_cmb(struct nvme_dev *dev)
         struct pci_dev *pdev = to_pci_dev(dev->dev);
         int bar;
 
+        if (dev->cmb_size)
+                return;
+
         dev->cmbsz = readl(dev->bar + NVME_REG_CMBSZ);
         if (!dev->cmbsz)
                 return;
@@ -2147,7 +2150,6 @@ static void nvme_pci_disable(struct nvme_dev *dev)
 {
         struct pci_dev *pdev = to_pci_dev(dev->dev);
 
-        nvme_release_cmb(dev);
         pci_free_irq_vectors(pdev);
 
         if (pci_is_enabled(pdev)) {
@@ -2595,6 +2597,7 @@ static void nvme_remove(struct pci_dev *pdev)
         nvme_stop_ctrl(&dev->ctrl);
         nvme_remove_namespaces(&dev->ctrl);
         nvme_dev_disable(dev, true);
+        nvme_release_cmb(dev);
         nvme_free_host_mem(dev);
         nvme_dev_remove_admin(dev);
         nvme_free_queues(dev, 0);