On 04/15/2016 02:27 AM, Kevin Wolf wrote: > 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 <[email protected]> > Signed-off-by: Kevin Wolf <[email protected]> > --- > 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); > } >
Don't you also want:
diff --git i/block/block-backend.c w/block/block-backend.c
index 140c3f7..c99f4ee 100644
--- i/block/block-backend.c
+++ w/block/block-backend.c
@@ -820,7 +820,7 @@ int blk_write_zeroes(BlockBackend *blk, int64_t
sector_num,
int nb_sectors, BdrvRequestFlags flags)
{
return blk_rw(blk, sector_num, NULL, nb_sectors, blk_write_entry,
- BDRV_REQ_ZERO_WRITE);
+ flags | BDRV_REQ_ZERO_WRITE);
}
static void error_callback_bh(void *opaque)
--
Eric Blake eblake redhat com +1-919-301-3266
Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
