From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:51029)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1YxPYC-0003rS-L2
	for qemu-devel@nongnu.org; Tue, 26 May 2015 20:50:29 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <flukshun@gmail.com>) id 1YxPY9-0002hj-9K
	for qemu-devel@nongnu.org; Tue, 26 May 2015 20:50:28 -0400
Sender: fluxion <flukshun@gmail.com>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
From: Michael Roth <mdroth@linux.vnet.ibm.com>
In-Reply-To: <1431327525-25625-2-git-send-email-justin@quarantainenet.nl>
References: <1431327525-25625-1-git-send-email-justin@quarantainenet.nl>
	<1431327525-25625-2-git-send-email-justin@quarantainenet.nl>
Message-ID: <20150527005010.5594.20483@loki>
Date: Tue, 26 May 2015 19:50:10 -0500
Subject: Re: [Qemu-devel] [PATCH v4 1/2] qga/commands-posix: Fix bug in
	guest-fstrim
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Justin Ossevoort <justin@quarantainenet.nl>, qemu-devel@nongnu.org
Cc: qemu-stable@nongnu.org

Quoting Justin Ossevoort (2015-05-11 01:58:44)
> The FITRIM ioctl updates the fstrim_range structure it receives. This
> way the caller can determine how many bytes were trimmed. The
> guest-fstrim logic reuses the same fstrim_range for each filesystem,
> effectively limiting each filesystem to trim at most as much as the
> previous was able to trim.
> =

> If a previous filesystem would have trimmed 0 bytes, than the next
> filesystem would report an error 'Invalid argument' because a FITRIM
> request with length 0 is not valid.
> =

> This change resets the fstrim_range structure for each filesystem.
> =

> Signed-off-by: Justin Ossevoort <justin@quarantainenet.nl>

Reviewed-by: Michael Roth <mdroth@linux.vnet.ibm.com>

Cc'ing qemu-stable@nongnu.org

> ---
>  qga/commands-posix.c | 9 ++++-----
>  1 file changed, 4 insertions(+), 5 deletions(-)
> =

> diff --git a/qga/commands-posix.c b/qga/commands-posix.c
> index ba8de62..4449628 100644
> --- a/qga/commands-posix.c
> +++ b/qga/commands-posix.c
> @@ -1332,11 +1332,7 @@ void qmp_guest_fstrim(bool has_minimum, int64_t mi=
nimum, Error **errp)
>      struct FsMount *mount;
>      int fd;
>      Error *local_err =3D NULL;
> -    struct fstrim_range r =3D {
> -        .start =3D 0,
> -        .len =3D -1,
> -        .minlen =3D has_minimum ? minimum : 0,
> -    };
> +    struct fstrim_range r;
> =

>      slog("guest-fstrim called");
> =

> @@ -1360,6 +1356,9 @@ void qmp_guest_fstrim(bool has_minimum, int64_t min=
imum, Error **errp)
>           * error means an unexpected error, so return it in those cases.=
  In
>           * some other cases ENOTTY will be reported (e.g. CD-ROMs).
>           */
> +        r.start =3D 0;
> +        r.len =3D -1;
> +        r.minlen =3D has_minimum ? minimum : 0;
>          ret =3D ioctl(fd, FITRIM, &r);
>          if (ret =3D=3D -1) {
>              if (errno !=3D ENOTTY && errno !=3D EOPNOTSUPP) {
> -- =

> 2.1.4
> =

>=20