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

* 'for-3.3/drivers' of git://git.kernel.dk/linux-block:
  mtip32xx: do rebuild monitoring asynchronously
  xen-blkfront: Use kcalloc instead of kzalloc to allocate array
  mtip32xx: uninitialized variable in mtip_quiesce_io()
  mtip32xx: updates based on feedback
  xen-blkback: convert hole punching to discard request on loop devices
  xen/blkback: Move processing of BLKIF_OP_DISCARD from dispatch_rw_block_io
  xen/blk[front|back]: Enhance discard support with secure erasing support.
  xen/blk[front|back]: Squash blkif_request_rw and blkif_request_discard together
  mtip32xx: update to new ->make_request() API
  mtip32xx: add module.h include to avoid conflict with moduleh tree
  mtip32xx: mark a few more items static
  mtip32xx: ensure that all local functions are static
  mtip32xx: cleanup compat ioctl handling
  mtip32xx: fix warnings/errors on 32-bit compiles
  block: Add driver for Micron RealSSD pcie flash cards

1 files changed, 12 insertions, 0 deletions

diff --git a/drivers/block/xen-blkback/xenbus.c b/drivers/block/xen-blkback/xenbus.c
index 37c794d31264..24a2fb57e5d0 100644
--- a/drivers/block/xen-blkback/xenbus.c
+++ b/drivers/block/xen-blkback/xenbus.c
@@ -338,6 +338,9 @@ static int xen_vbd_create(struct xen_blkif *blkif, blkif_vdev_t handle,
         if (q && q->flush_flags)
                 vbd->flush_support = true;
 
+        if (q && blk_queue_secdiscard(q))
+                vbd->discard_secure = true;
+
         DPRINTK("Successful creation of handle=%04x (dom=%u)\n",
                 handle, blkif->domid);
         return 0;
@@ -420,6 +423,15 @@ int xen_blkbk_discard(struct xenbus_transaction xbt, struct backend_info *be)
                                 state = 1;
                                 blkif->blk_backend_type = BLKIF_BACKEND_PHY;
                         }
+                        /* Optional. */
+                        err = xenbus_printf(xbt, dev->nodename,
+                                "discard-secure", "%d",
+                                blkif->vbd.discard_secure);
+                        if (err) {
+                                xenbus_dev_fatal(dev, err,
+                                        "writting discard-secure");
+                                goto kfree;
+                        }
                 }
         } else {
                 err = PTR_ERR(type);