From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:47701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5yCG-0004Ou-0s for qemu-devel@nongnu.org; Tue, 20 Sep 2011 07:09:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1R5yCE-0008V0-HC for qemu-devel@nongnu.org; Tue, 20 Sep 2011 07:09:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53950) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1R5yCD-0008Un-TB for qemu-devel@nongnu.org; Tue, 20 Sep 2011 07:09:02 -0400 From: Kevin Wolf Date: Tue, 20 Sep 2011 13:11:35 +0200 Message-Id: <1316517112-9908-4-git-send-email-kwolf@redhat.com> In-Reply-To: <1316517112-9908-1-git-send-email-kwolf@redhat.com> References: <1316517112-9908-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 03/20] nbd: support NBD_SET_FLAGS ioctl List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Paolo Bonzini The nbd kernel module cannot enable DISCARD requests unless it is informed about it. The flags field in the header is used for this, and this patch adds support for it. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- nbd.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/nbd.c b/nbd.c index d32a19e..595f4d8 100644 --- a/nbd.c +++ b/nbd.c @@ -378,6 +378,14 @@ int nbd_init(int fd, int csock, uint32_t flags, off_t size, size_t blocksize) } } + if (ioctl(fd, NBD_SET_FLAGS, flags) < 0 + && errno != ENOTTY) { + int serrno = errno; + LOG("Failed setting flags"); + errno = serrno; + return -1; + } + TRACE("Clearing NBD socket"); if (ioctl(fd, NBD_CLEAR_SOCK) == -1) { -- 1.7.6.2