From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43497) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar4Hn-0004oB-Ra for qemu-devel@nongnu.org; Fri, 15 Apr 2016 09:59:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ar4Hm-0001Pd-Qg for qemu-devel@nongnu.org; Fri, 15 Apr 2016 09:59:51 -0400 References: <1460708832-8819-1-git-send-email-kwolf@redhat.com> From: Eric Blake Message-ID: <5710F3CF.70402@redhat.com> Date: Fri, 15 Apr 2016 07:59:43 -0600 MIME-Version: 1.0 In-Reply-To: <1460708832-8819-1-git-send-email-kwolf@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="cJ7CRhB33wTRBKvpFdcDLUxt9rJmDKABp" Subject: Re: [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: Kevin Wolf , qemu-block@nongnu.org Cc: qemu-devel@nongnu.org, mreitz@redhat.com This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --cJ7CRhB33wTRBKvpFdcDLUxt9rJmDKABp Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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). >=20 > Reported-by: Max Reitz > Signed-off-by: Kevin Wolf > --- > block/block-backend.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > 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, > =20 > 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_WRI= TE, > + cb, opaque); > } > =20 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) --=20 Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org --cJ7CRhB33wTRBKvpFdcDLUxt9rJmDKABp Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 Comment: Public key at http://people.redhat.com/eblake/eblake.gpg Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQEcBAEBCAAGBQJXEPPPAAoJEKeha0olJ0NqV9wH/0fxQ/Kr+OwmG12/LXjFMgsU zbY3SmPTXcXRIg0JGGII/rLQeYHAor06JeBxVEBXiuf2D+aR3cCieEzi42ThEYXe nHIZK8G3cMtK9qIIDNuHDbPR3Ld2sh3dsVK2F8yMoAyMmW02G6XINRs/FqvSYCdR GF9w3xvmTKvx01e7RDZ2+o+9MU7eLtnuL2rsQOOEybPrOpLTeMqYurAsQSqVNIui ZYBPgTXPhwXk2SvdJCltrePi3J/0SyserQJkR1iGablf/eXI7SMOheeIGdT2slKl r1ofQZJrPfHrb64rbQFGhGsHJkvdmKvqRFqBKYBAgbfUdqDtXeXERlMN9xQpxrY= =aXfl -----END PGP SIGNATURE----- --cJ7CRhB33wTRBKvpFdcDLUxt9rJmDKABp--