From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59812) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aqz64-0001t0-5d for qemu-devel@nongnu.org; Fri, 15 Apr 2016 04:27:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aqz63-0000Hi-BE for qemu-devel@nongnu.org; Fri, 15 Apr 2016 04:27:24 -0400 From: Kevin Wolf Date: Fri, 15 Apr 2016 10:27:12 +0200 Message-Id: <1460708832-8819-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH for-2.6] block: Don't ignore flags in blk_aio_write_zeroes() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-block@nongnu.org Cc: kwolf@redhat.com, mreitz@redhat.com, qemu-devel@nongnu.org Commit 57d6a428 neglected to pass the given flags to blk_aio_prwv(), which broke discard by WRITE SAME for scsi-disk (the UNMAP bit would be ignored). Reported-by: Max Reitz Signed-off-by: Kevin Wolf --- block/block-backend.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/block-backend.c b/block/block-backend.c index 140c3f7..83cec29 100644 --- a/block/block-backend.c +++ b/block/block-backend.c @@ -942,7 +942,8 @@ BlockAIOCB *blk_aio_write_zeroes(BlockBackend *blk, int64_t sector_num, return blk_aio_prwv(blk, sector_num << BDRV_SECTOR_BITS, nb_sectors << BDRV_SECTOR_BITS, NULL, - blk_aio_write_entry, BDRV_REQ_ZERO_WRITE, cb, opaque); + blk_aio_write_entry, flags | BDRV_REQ_ZERO_WRITE, + cb, opaque); } int blk_pread(BlockBackend *blk, int64_t offset, void *buf, int count) -- 1.8.3.1