Merge branch 'for-4.8/drivers' of git://git.kernel.dk/linux-block

Pull block driver updates from Jens Axboe:
 "This branch also contains core changes.  I've come to the conclusion
  that from 4.9 and forward, I'll be doing just a single branch.  We
  often have dependencies between core and drivers, and it's hard to
  always split them up appropriately without pulling core into drivers
  when that happens.

  That said, this contains:

   - separate secure erase type for the core block layer, from
     Christoph.

   - set of discard fixes, from Christoph.

   - bio shrinking fixes from Christoph, as a followup up to the
     op/flags change in the core branch.

   - map and append request fixes from Christoph.

   - NVMeF (NVMe over Fabrics) code from Christoph.  This is pretty
     exciting!

   - nvme-loop fixes from Arnd.

   - removal of ->driverfs_dev from Dan, after providing a
     device_add_disk() helper.

   - bcache fixes from Bhaktipriya and Yijing.

   - cdrom subchannel read fix from Vchannaiah.

   - set of lightnvm updates from Wenwei, Matias, Johannes, and Javier.

   - set of drbd updates and fixes from Fabian, Lars, and Philipp.

   - mg_disk error path fix from Bart.

   - user notification for failed device add for loop, from Minfei.

   - NVMe in general:
        + NVMe delay quirk from Guilherme.
        + SR-IOV support and command retry limits from Keith.
        + fix for memory-less NUMA node from Masayoshi.
        + use UINT_MAX for discard sectors, from Minfei.
        + cancel IO fixes from Ming.
        + don't allocate unused major, from Neil.
        + error code fixup from Dan.
        + use constants for PSDT/FUSE from James.
        + variable init fix from Jay.
        + fabrics fixes from Ming, Sagi, and Wei.
        + various fixes"

* 'for-4.8/drivers' of git://git.kernel.dk/linux-block: (115 commits)
  nvme/pci: Provide SR-IOV support
  nvme: initialize variable before logical OR'ing it
  block: unexport various bio mapping helpers
  scsi/osd: open code blk_make_request
  target: stop using blk_make_request
  block: simplify and export blk_rq_append_bio
  block: ensure bios return from blk_get_request are properly initialized
  virtio_blk: use blk_rq_map_kern
  memstick: don't allow REQ_TYPE_BLOCK_PC requests
  block: shrink bio size again
  block: simplify and cleanup bvec pool handling
  block: get rid of bio_rw and READA
  block: don't ignore -EOPNOTSUPP blkdev_issue_write_same
  block: introduce BLKDEV_DISCARD_ZERO to fix zeroout
  NVMe: don't allocate unused nvme_major
  nvme: avoid crashes when node 0 is memoryless node.
  nvme: Limit command retries
  loop: Make user notify for adding loop device failed
  nvme-loop: fix nvme-loop Kconfig dependencies
  nvmet: fix return value check in nvmet_subsys_alloc()
  ...

1 files changed, 10 insertions, 8 deletions

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index da05d3f9bad2..0b6682a33e3b 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -548,7 +548,7 @@ static int blkif_queue_discard_req(struct request *req, struct blkfront_ring_inf
         ring_req->u.discard.nr_sectors = blk_rq_sectors(req);
         ring_req->u.discard.id = id;
         ring_req->u.discard.sector_number = (blkif_sector_t)blk_rq_pos(req);
-        if ((req->cmd_flags & REQ_SECURE) && info->feature_secdiscard)
+        if (req_op(req) == REQ_OP_SECURE_ERASE && info->feature_secdiscard)
                 ring_req->u.discard.flag = BLKIF_DISCARD_SECURE;
         else
                 ring_req->u.discard.flag = 0;
@@ -844,7 +844,7 @@ static int blkif_queue_request(struct request *req, struct blkfront_ring_info *r
                 return 1;
 
         if (unlikely(req_op(req) == REQ_OP_DISCARD ||
-                     req->cmd_flags & REQ_SECURE))
+                     req_op(req) == REQ_OP_SECURE_ERASE))
                 return blkif_queue_discard_req(req, rinfo);
         else
                 return blkif_queue_rw_req(req, rinfo);
@@ -952,7 +952,7 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size,
                 rq->limits.discard_granularity = info->discard_granularity;
                 rq->limits.discard_alignment = info->discard_alignment;
                 if (info->feature_secdiscard)
-                        queue_flag_set_unlocked(QUEUE_FLAG_SECDISCARD, rq);
+                        queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, rq);
         }
 
         /* Hard sector size and max sectors impersonate the equiv. hardware. */
@@ -1134,7 +1134,6 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity,
         gd->first_minor = minor;
         gd->fops = &xlvbd_block_fops;
         gd->private_data = info;
-        gd->driverfs_dev = &(info->xbdev->dev);
         set_capacity(gd, capacity);
 
         if (xlvbd_init_blk_queue(gd, sector_size, physical_sector_size,
@@ -1592,7 +1591,7 @@ static irqreturn_t blkif_interrupt(int irq, void *dev_id)
                                 info->feature_discard = 0;
                                 info->feature_secdiscard = 0;
                                 queue_flag_clear(QUEUE_FLAG_DISCARD, rq);
-                                queue_flag_clear(QUEUE_FLAG_SECDISCARD, rq);
+                                queue_flag_clear(QUEUE_FLAG_SECERASE, rq);
                         }
                         blk_mq_complete_request(req, error);
                         break;
@@ -2106,11 +2105,14 @@ static int blkfront_resume(struct xenbus_device *dev)
                          */
                         if (req_op(shadow[i].request) == REQ_OP_FLUSH ||
                             req_op(shadow[i].request) == REQ_OP_DISCARD ||
-                            shadow[j].request->cmd_flags & (REQ_FUA | REQ_SECURE)) {
-                            
+                            req_op(shadow[i].request) == REQ_OP_SECURE_ERASE ||
+                            shadow[j].request->cmd_flags & REQ_FUA) {
                                 /*
                                  * Flush operations don't contain bios, so
                                  * we need to requeue the whole request
+                                 *
+                                 * XXX: but this doesn't make any sense for a
+                                 * write with the FUA flag set..
                                  */
                                 list_add(&shadow[j].request->queuelist, &info->requests);
                                 continue;
@@ -2445,7 +2447,7 @@ static void blkfront_connect(struct blkfront_info *info)
         for (i = 0; i < info->nr_rings; i++)
                 kick_pending_request_queues(&info->rinfo[i]);
 
-        add_disk(info->gd);
+        device_add_disk(&info->xbdev->dev, info->gd);
 
         info->is_ready = 1;
 }