From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Thu, 2 Feb 2012 19:20:07 +0000 (-0500)
Subject: Merge branch 'stable/xen-block.rebase' into stable/for-linus-3.3.rebased
X-Git-Tag: v2.6.39-400.9.0~595^2~14^2~12
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=638922d1c81563ab3ca9caa087a36971a69dbcd6;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'stable/xen-block.rebase' into stable/for-linus-3.3.rebased

* stable/xen-block.rebase: (21 commits)
  xen-blkback: Don't disconnect backend until state switched to XenbusStateClosed.
  block: xen-blkback: use API provided by xenbus module to map rings
  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
  xen/blkback: Fix two races in the handling of barrier requests.
  xen/blkback: Check for proper operation.
  xen/blkback: Fix the inhibition to map pages when discarding sector ranges.
  xen/blkback: Report VBD_WSECT (wr_sect) properly.
  xen/blkback: Support 'feature-barrier' aka old-style BARRIER requests.
  xen-blkfront: plug device number leak in xlblk_init() error path
  xen-blkfront: If no barrier or flush is supported, use invalid operation.
  xen-blkback: use kzalloc() in favor of kmalloc()+memset()
  xen-blkback: fixed indentation and comments
  xen-blkfront: fix a deadlock while handling discard response
  xen-blkfront: Handle discard requests.
  xen-blkback: Implement discard requests ('feature-discard')
  xen-blkfront: add BLKIF_OP_DISCARD and discard request struct
  xen/blkback: Add module alias for autoloading
  ...
---

638922d1c81563ab3ca9caa087a36971a69dbcd6