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

Pull block layer fixes from Jens Axboe:

 - Single range elevator discard merge fix, that caused crashes (Ming)

 - Fix for a regression in O_DIRECT, where we could potentially lose the
   error value (Maximilian Heyne)

 - NVMe pull request from Christoph, with little fixes all over the map
   for NVMe.

* tag 'for-linus-20181201' of git://git.kernel.dk/linux-block:
  block: fix single range discard merge
  nvme-rdma: fix double freeing of async event data
  nvme: flush namespace scanning work just before removing namespaces
  nvme: warn when finding multi-port subsystems without multipathing enabled
  fs: fix lost error code in dio_complete
  nvme-pci: fix surprise removal
  nvme-fc: initialize nvme_req(rq)->ctrl after calling __nvme_fc_init_request()
  nvme: Free ctrl device name on init failure

6 files changed, 14 insertions, 7 deletions

diff --git a/block/blk-merge.c b/block/blk-merge.c
index e7696c47489a..7695034f4b87 100644
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -820,7 +820,7 @@ static struct request *attempt_merge(struct request_queue *q,
 
         req->__data_len += blk_rq_bytes(next);
 
-        if (req_op(req) != REQ_OP_DISCARD)
+        if (!blk_discard_mergable(req))
                 elv_merge_requests(q, req, next);
 
         /*
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c
index 559d567693b8..3cf1b773158e 100644
--- a/drivers/nvme/host/core.c
+++ b/drivers/nvme/host/core.c
@@ -3314,6 +3314,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl)
         struct nvme_ns *ns, *next;
         LIST_HEAD(ns_list);
 
+        /* prevent racing with ns scanning */
+        flush_work(&ctrl->scan_work);
+
         /*
          * The dead states indicates the controller was not gracefully
          * disconnected. In that case, we won't be able to flush any data while
@@ -3476,7 +3479,6 @@ void nvme_stop_ctrl(struct nvme_ctrl *ctrl)
         nvme_mpath_stop(ctrl);
         nvme_stop_keep_alive(ctrl);
         flush_work(&ctrl->async_event_work);
-        flush_work(&ctrl->scan_work);
         cancel_work_sync(&ctrl->fw_act_work);
         if (ctrl->ops->stop_ctrl)
                 ctrl->ops->stop_ctrl(ctrl);
@@ -3585,7 +3587,7 @@ int nvme_init_ctrl(struct nvme_ctrl *ctrl, struct device *dev,
 
         return 0;
 out_free_name:
-        kfree_const(dev->kobj.name);
+        kfree_const(ctrl->device->kobj.name);
 out_release_instance:
         ida_simple_remove(&nvme_instance_ida, ctrl->instance);
 out:
@@ -3607,7 +3609,7 @@ void nvme_kill_queues(struct nvme_ctrl *ctrl)
         down_read(&ctrl->namespaces_rwsem);
 
         /* Forcibly unquiesce queues to avoid blocking dispatch */
-        if (ctrl->admin_q)
+        if (ctrl->admin_q && !blk_queue_dying(ctrl->admin_q))
                 blk_mq_unquiesce_queue(ctrl->admin_q);
 
         list_for_each_entry(ns, &ctrl->namespaces, list)
diff --git a/drivers/nvme/host/fc.c b/drivers/nvme/host/fc.c
index 54032c466636..feb86b59170e 100644
--- a/drivers/nvme/host/fc.c
+++ b/drivers/nvme/host/fc.c
@@ -1752,12 +1752,12 @@ nvme_fc_init_request(struct blk_mq_tag_set *set, struct request *rq,
         struct nvme_fc_queue *queue = &ctrl->queues[queue_idx];
         int res;
 
-        nvme_req(rq)->ctrl = &ctrl->ctrl;
         res = __nvme_fc_init_request(ctrl, queue, &op->op, rq, queue->rqcnt++);
         if (res)
                 return res;
         op->op.fcp_req.first_sgl = &op->sgl[0];
         op->op.fcp_req.private = &op->priv[0];
+        nvme_req(rq)->ctrl = &ctrl->ctrl;
         return res;
 }
 
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h
index cee79cb388af..081cbdcce880 100644
--- a/drivers/nvme/host/nvme.h
+++ b/drivers/nvme/host/nvme.h
@@ -531,6 +531,9 @@ static inline void nvme_mpath_check_last_path(struct nvme_ns *ns)
 static inline int nvme_mpath_init(struct nvme_ctrl *ctrl,
                 struct nvme_id_ctrl *id)
 {
+        if (ctrl->subsys->cmic & (1 << 3))
+                dev_warn(ctrl->device,
+"Please enable CONFIG_NVME_MULTIPATH for full support of multi-port devices.\n");
         return 0;
 }
 static inline void nvme_mpath_uninit(struct nvme_ctrl *ctrl)
diff --git a/drivers/nvme/host/rdma.c b/drivers/nvme/host/rdma.c
index d181cafedc58..ab6ec7295bf9 100644
--- a/drivers/nvme/host/rdma.c
+++ b/drivers/nvme/host/rdma.c
@@ -184,6 +184,7 @@ static int nvme_rdma_alloc_qe(struct ib_device *ibdev, struct nvme_rdma_qe *qe,
         qe->dma = ib_dma_map_single(ibdev, qe->data, capsule_size, dir);
         if (ib_dma_mapping_error(ibdev, qe->dma)) {
                 kfree(qe->data);
+                qe->data = NULL;
                 return -ENOMEM;
         }
 
@@ -823,6 +824,7 @@ out_free_tagset:
 out_free_async_qe:
         nvme_rdma_free_qe(ctrl->device->dev, &ctrl->async_event_sqe,
                 sizeof(struct nvme_command), DMA_TO_DEVICE);
+        ctrl->async_event_sqe.data = NULL;
 out_free_queue:
         nvme_rdma_free_queue(&ctrl->queues[0]);
         return error;
diff --git a/fs/direct-io.c b/fs/direct-io.c
index 722d17c88edb..41a0e97252ae 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -325,8 +325,8 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, unsigned int flags)
                  */
                 dio->iocb->ki_pos += transferred;
 
-                if (dio->op == REQ_OP_WRITE)
-                        ret = generic_write_sync(dio->iocb,  transferred);
+                if (ret > 0 && dio->op == REQ_OP_WRITE)
+                        ret = generic_write_sync(dio->iocb, ret);
                 dio->iocb->ki_complete(dio->iocb, ret, 0);
         }