From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YxK09-0002Vi-Oi for qemu-devel@nongnu.org; Tue, 26 May 2015 14:54:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YxK07-0002UR-16 for qemu-devel@nongnu.org; Tue, 26 May 2015 14:54:57 -0400 Date: Tue, 26 May 2015 20:54:46 +0200 From: Thomas Huth Message-ID: <20150526205446.77efe70d@thh440s> 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> MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH v4 1/2] qga/commands-posix: Fix bug in guest-fstrim List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com Cc: qemu-stable@nongnu.org, Justin Ossevoort On Mon, 11 May 2015 08:58:44 +0200 Justin Ossevoort wrote: > 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 > --- > 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 minimum, Error **errp) > struct FsMount *mount; > int fd; > Error *local_err = NULL; > - struct fstrim_range r = { > - .start = 0, > - .len = -1, > - .minlen = 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 minimum, 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 = 0; > + r.len = -1; > + r.minlen = has_minimum ? minimum : 0; > ret = ioctl(fd, FITRIM, &r); > if (ret == -1) { > if (errno != ENOTTY && errno != EOPNOTSUPP) { *ping* Michael, could you please have a look at this bugfix? Without it, the fstrim command is pretty useless if the guest uses more than one filesystem that could be trimmed... Thomas