From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56254) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ar55K-0008Jd-7j for qemu-devel@nongnu.org; Fri, 15 Apr 2016 10:51:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ar55J-0007L5-7z for qemu-devel@nongnu.org; Fri, 15 Apr 2016 10:51:02 -0400 Date: Fri, 15 Apr 2016 16:50:53 +0200 From: Kevin Wolf Message-ID: <20160415145053.GF4341@noname.redhat.com> References: <1460708832-8819-1-git-send-email-kwolf@redhat.com> <5710F3CF.70402@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="4ZLFUWh1odzi/v6L" Content-Disposition: inline In-Reply-To: <5710F3CF.70402@redhat.com> 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: Eric Blake Cc: qemu-block@nongnu.org, qemu-devel@nongnu.org, mreitz@redhat.com --4ZLFUWh1odzi/v6L Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Am 15.04.2016 um 15:59 hat Eric Blake geschrieben: > 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 >=20 > Don't you also want: >=20 > 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); > } I guess I should want that. And blk_co_write_zeroes(), too. Kevin --4ZLFUWh1odzi/v6L Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBAgAGBQJXEP/NAAoJEH8JsnLIjy/WOSkP/35WDkOdVe6JALOuBYTEpjIs uZNdfKv1u5CQe5B5we/u3e3NMDcCB396jYJWFhEISxD2yseReD8PqNQNJcdWWx8p ZTt+pahmU3obTQ2WMw1fGkEaqFR7XnaUiSBVCbN6CNwjTnalpYK+v1ukDVx7bPC9 Kh8faLN4KpE570MvE4dzlu/JMgokJATw2O2StUPDdKae231vkABUhGrUedqUzjxF +r5a5wwAfYQPMB4qmMh+/GfDE+qr/D7u2kdk3ld6IqeOVp1J2G6GcgbhD7HnerZu vm438eQ0ymwjV5IWwDRR+OpHD43Jno6+Hfm5l8u6WL+PlzFz0mULWtF8JroSQwqk qrETTZHTl0ipTnrV/2smB5vhrhnXJh3Ptun/TBwHCJQxtgGD8Bq/uulkmWmxNv1c KSwk1mkQ8eYlWnbqVaW4c5XIuUgRVyaCrUiejqJ02p5t+LANi3q7+z03ULC3sqO2 TxNJOaKaRMPLF/NGmZaXcZeIUnRcGOaXhKTIzkRMt7diAgf5O8eBhHLW46nvi9jW Uzr1iB8r2bYjGmiEeUyZA0rYJkjt9yB414kpjIVOWND3YIF20i1viFHOzvyKt10h zI6n2QgqRWPaO/tAwLuHQn9NCI4QW33h5NNRGE1SSFUxflYqyy/awPL9eZcGywEM Q7ojGQNzhGymdr9QOzTN =ZULO -----END PGP SIGNATURE----- --4ZLFUWh1odzi/v6L--