From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43820) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnpTm-0001js-2F for qemu-devel@nongnu.org; Thu, 30 Apr 2015 10:30:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YnpTi-0004EF-1s for qemu-devel@nongnu.org; Thu, 30 Apr 2015 10:30:18 -0400 Received: from outgoing-mail.quarantainenet.nl ([91.220.21.150]:39919) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YnpTh-0004Ce-Ov for qemu-devel@nongnu.org; Thu, 30 Apr 2015 10:30:13 -0400 From: Justin Ossevoort Date: Thu, 30 Apr 2015 16:29:57 +0200 Message-Id: <1430404198-10324-2-git-send-email-justin@quarantainenet.nl> In-Reply-To: <1430404198-10324-1-git-send-email-justin@quarantainenet.nl> References: <1430404198-10324-1-git-send-email-justin@quarantainenet.nl> Subject: [Qemu-devel] [PATCH v3 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 Cc: mdroth@linux.vnet.ibm.com, Justin Ossevoort 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) { -- 2.1.4