From patchwork Tue Jan 15 16:48:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 212284 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 5749E2C0098 for ; Wed, 16 Jan 2013 05:02:39 +1100 (EST) Received: from localhost ([::1]:51786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9he-0003rG-26 for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 11:49:34 -0500 Received: from eggs.gnu.org ([208.118.235.92]:32951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9gw-0001xk-M8 for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:48:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv9gt-0005WA-Ss for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:48:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:53814) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv9gt-0005Vw-Lw for qemu-devel@nongnu.org; Tue, 15 Jan 2013 11:48:47 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r0FGmlT3030301 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 15 Jan 2013 11:48:47 -0500 Received: from localhost (ovpn-112-16.ams2.redhat.com [10.36.112.16]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r0FGmjai024469; Tue, 15 Jan 2013 11:48:46 -0500 From: Stefan Hajnoczi To: Date: Tue, 15 Jan 2013 17:48:20 +0100 Message-Id: <1358268511-27061-5-git-send-email-stefanha@redhat.com> In-Reply-To: <1358268511-27061-1-git-send-email-stefanha@redhat.com> References: <1358268511-27061-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Paolo Bonzini , Anthony Liguori , Stefan Hajnoczi Subject: [Qemu-devel] [PATCH 04/15] raw-posix: remember whether discard failed 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 From: Paolo Bonzini Avoid sending system calls repeatedly if they shall fail. This does not apply to XFS: if the filesystem-specific ioctl fails, something weird is happening. Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- block/raw-posix.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/block/raw-posix.c b/block/raw-posix.c index e8d79af..b647cfb 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -141,6 +141,7 @@ typedef struct BDRVRawState { #ifdef CONFIG_XFS bool is_xfs : 1; #endif + bool has_discard : 1; } BDRVRawState; typedef struct BDRVRawReopenState { @@ -292,6 +293,7 @@ static int raw_open_common(BlockDriverState *bs, const char *filename, } #endif + s->has_discard = 1; #ifdef CONFIG_XFS if (platform_test_xfs_fd(s->fd)) { s->is_xfs = 1; @@ -1078,10 +1080,12 @@ static coroutine_fn int raw_co_discard(BlockDriverState *bs, int64_t sector_num, int nb_sectors) { int ret = -EOPNOTSUPP; - -#if defined(CONFIG_FALLOCATE_PUNCH_HOLE) || defined(CONFIG_XFS) BDRVRawState *s = bs->opaque; + if (!s->has_discard) { + return 0; + } + #ifdef CONFIG_XFS if (s->is_xfs) { return xfs_discard(s, sector_num, nb_sectors); @@ -1099,7 +1103,6 @@ static coroutine_fn int raw_co_discard(BlockDriverState *bs, ret = -errno; #endif -#endif if (ret == -EOPNOTSUPP) { return 0;