From patchwork Thu Jun 27 13:11:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 255063 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 2252C2C00A6 for ; Thu, 27 Jun 2013 23:14:19 +1000 (EST) Received: from localhost ([::1]:37944 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsC1h-0005fV-57 for incoming@patchwork.ozlabs.org; Thu, 27 Jun 2013 09:14:17 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54285) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UsC0e-0004W7-6H for qemu-devel@nongnu.org; Thu, 27 Jun 2013 09:13:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UsC0W-00043R-3B for qemu-devel@nongnu.org; Thu, 27 Jun 2013 09:13:12 -0400 Received: from mx.ipv6.kamp.de ([2a02:248:0:51::16]:45424 helo=mx01.kamp.de) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1UsC0V-000437-PQ for qemu-devel@nongnu.org; Thu, 27 Jun 2013 09:13:04 -0400 Received: (qmail 8026 invoked by uid 89); 27 Jun 2013 13:13:02 -0000 Received: from [82.141.1.145] by client-16-kamp (envelope-from , uid 89) with qmail-scanner-2.01 (clamdscan: 0.97.8/17424. hbedv: 8.2.12.66/7.11.87.102. spamassassin: 3.3.1. Clear:RC:1(82.141.1.145):SA:0(-1.2/5.0):. Processed in 1.471085 secs); 27 Jun 2013 13:13:02 -0000 Received: from ns.kamp-intra.net (HELO dns.kamp-intra.net) ([82.141.1.145]) by mx01.kamp.de with SMTP; 27 Jun 2013 13:13:01 -0000 X-GL_Whitelist: yes Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id C0B40206B1; Thu, 27 Jun 2013 15:11:39 +0200 (CEST) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id 3ABBC6112E; Thu, 27 Jun 2013 15:11:40 +0200 (CEST) From: Peter Lieven To: qemu-devel@nongnu.org Date: Thu, 27 Jun 2013 15:11:34 +0200 Message-Id: <1372338695-411-11-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1372338695-411-1-git-send-email-pl@kamp.de> References: <1372338695-411-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a02:248:0:51::16 Cc: kwolf@redhat.com, pbonzini@redhat.com, Peter Lieven , ronniesahlberg@gmail.com, stefanha@redhat.com Subject: [Qemu-devel] [PATCHv2 10/11] iscsi: ignore aio_discard if unsupported X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org if the target does not support UNMAP or the request is too big silently ignore the discard request. Signed-off-by: Peter Lieven --- block/iscsi.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/block/iscsi.c b/block/iscsi.c index e9ecfce..0567b46 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -694,6 +694,14 @@ iscsi_aio_discard(BlockDriverState *bs, acb->sector_num = sector_num; acb->retries = ISCSI_CMD_RETRIES; + if (!iscsilun->lbpu || + sector_qemu2lun(nb_sectors, iscsilun) > iscsilun->max_unmap) { + /* silently ignore discard request */ + acb->status = 0; + iscsi_schedule_bh(acb); + return &acb->common; + } + if (iscsi_aio_discard_acb(acb) != 0) { qemu_aio_release(acb); return NULL;