From patchwork Mon Jan 14 11:18:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 1024436 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=virtuozzo.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=virtuozzo.com header.i=@virtuozzo.com header.b="KPeB65Ut"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43dWR21w31z9s9G for ; Mon, 14 Jan 2019 22:27:26 +1100 (AEDT) Received: from localhost ([127.0.0.1]:50478 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj0Oq-0006nj-55 for incoming@patchwork.ozlabs.org; Mon, 14 Jan 2019 06:27:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:37481) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gj0Gd-0000Wo-Ct for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:18:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gj0Gb-0001C3-9n for qemu-devel@nongnu.org; Mon, 14 Jan 2019 06:18:55 -0500 Received: from mail-eopbgr130115.outbound.protection.outlook.com ([40.107.13.115]:51232 helo=EUR01-HE1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gj0Ga-0000hM-UX; Mon, 14 Jan 2019 06:18:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=JZNL714D1rhrTDqCEe2oN5lm/1lzo9U73jcM/egEWyQ=; b=KPeB65UtsvFjnX2UYRsf/SvmvZOkaOpuheN3K/RGcd9qurheqUCUVDkaRa+QKVvP+rh0HG4dacHJ1oisQgnF99JFlUZyBiSZcLEfwZq491p0ErBYs4q+iobTGOgZKTLavvO43E3TVU8OJmGBPV4Ytwus6g7m98qw+LA4kvXpoSo= Received: from AM0PR08MB4292.eurprd08.prod.outlook.com (20.179.33.17) by AM0PR08MB2977.eurprd08.prod.outlook.com (52.134.92.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1516.14; Mon, 14 Jan 2019 11:18:28 +0000 Received: from AM0PR08MB4292.eurprd08.prod.outlook.com ([fe80::d13a:1305:bb54:1916]) by AM0PR08MB4292.eurprd08.prod.outlook.com ([fe80::d13a:1305:bb54:1916%6]) with mapi id 15.20.1516.019; Mon, 14 Jan 2019 11:18:28 +0000 From: Anton Nefedov To: "qemu-devel@nongnu.org" Thread-Topic: [PATCH v12 06/10] file-posix: reset fallocate-related flags without CONFIG_FALLOCATE* Thread-Index: AQHUq/rfUbi3weDVF06LqrbHeWpRyg== Date: Mon, 14 Jan 2019 11:18:27 +0000 Message-ID: <20190114111744.113188-7-anton.nefedov@virtuozzo.com> References: <20190114111744.113188-1-anton.nefedov@virtuozzo.com> In-Reply-To: <20190114111744.113188-1-anton.nefedov@virtuozzo.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1PR0701CA0065.eurprd07.prod.outlook.com (2603:10a6:3:9e::33) To AM0PR08MB4292.eurprd08.prod.outlook.com (2603:10a6:208:13b::17) x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [185.231.240.5] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR08MB2977; 20:xr7IePCzo8cHxS/Ow3mnA0Etp6M9+Ms4NcgPq23BGAv9xeC/8fHxc4hlnHzVdDb/+F2RYsHBQ1cH0Ju3MiAbYcnt8OvH02nSKsh6bzdc53ZJ5YhaP8U6RWHTOSLMfER9c3T5iHwdPZij497WYLXB8nr6ASF1A7qvAu51es3Oa1g= x-ms-office365-filtering-correlation-id: b3bc97e2-c687-466a-6cd5-08d67a1201b3 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600109)(711020)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB2977; x-ms-traffictypediagnostic: AM0PR08MB2977: x-microsoft-antispam-prvs: x-forefront-prvs: 0917DFAC67 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(39840400004)(396003)(136003)(366004)(346002)(376002)(199004)(189003)(6346003)(256004)(14454004)(5640700003)(6486002)(6916009)(8936002)(1076003)(36756003)(97736004)(53936002)(305945005)(476003)(107886003)(478600001)(186003)(2906002)(486006)(6116002)(50226002)(3846002)(26005)(2501003)(2616005)(99286004)(8676002)(11346002)(66066001)(4326008)(5660300001)(52116002)(71200400001)(81156014)(25786009)(81166006)(71190400001)(76176011)(2351001)(7736002)(316002)(105586002)(106356001)(68736007)(102836004)(44832011)(6436002)(446003)(54906003)(6512007)(86362001)(6506007)(386003); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB2977; H:AM0PR08MB4292.eurprd08.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: virtuozzo.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: PDDZyWRz2GiO/rWqHp+CtWQhKkp+rvROnqAeh5TqT/QySBCWsZbosBPNrne7J+Z2Lcw7p05QmHA8WQqHHwwYwWnFdSMs7BjKIn/29rCXVNoXzSaS2HPfuKxadGCOsjNvMJrG6cJQ/AWsLax24m3dmS38r973QOYnzrjeLezw4QSJiR2qBUFS935TeSnogGygsbNgYY1ykw0F1I1sgSGBh1OV1rYdtxT+Y9YHWl4iAAuXPydwaskG+kG7bXQqKNK2Z58Be2YU6sTHBZS3QKORspEklykCww7rDauILAVLdr8Aoqi6rWXXIf65rxc4sCKVGRsu5FSrNIbnn8s/Oe0zdEfQxNHb8YasvrUXDpghnWmXTCOgn6PUcuHQ2XM/lRW0Po/yovx9/VDXild03T/sMU+YkniEACeKk/Zwg0MMN3I= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3bc97e2-c687-466a-6cd5-08d67a1201b3 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Jan 2019 11:18:27.0215 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB2977 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 40.107.13.115 Subject: [Qemu-devel] [PATCH v12 06/10] file-posix: reset fallocate-related flags without CONFIG_FALLOCATE* X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "kwolf@redhat.com" , Vladimir Sementsov-Ogievskiy , "berto@igalia.com" , Denis Lunev , "qemu-block@nongnu.org" , "mreitz@redhat.com" , Anton Nefedov Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" these flags currently affect nothing without CONFIG_FALLOCATE*, so it's not a bug, but fixing it makes possible to adjust supported zero flag BDRV_REQ_ALLOCATE regardless of configuration. Signed-off-by: Anton Nefedov Reviewed-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Alberto Garcia --- block/file-posix.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/file-posix.c b/block/file-posix.c index 8aee7a3fb8..8d3ec96627 100644 --- a/block/file-posix.c +++ b/block/file-posix.c @@ -1488,9 +1488,7 @@ static ssize_t handle_aiocb_write_zeroes_block(RawPosixAIOData *aiocb) static int handle_aiocb_write_zeroes(void *opaque) { RawPosixAIOData *aiocb = opaque; -#if defined(CONFIG_FALLOCATE) || defined(CONFIG_XFS) BDRVRawState *s = aiocb->bs->opaque; -#endif #ifdef CONFIG_FALLOCATE int64_t len; #endif @@ -1514,6 +1512,8 @@ static int handle_aiocb_write_zeroes(void *opaque) } s->has_write_zeroes = false; } +#else + s->has_write_zeroes = false; #endif #ifdef CONFIG_FALLOCATE_PUNCH_HOLE @@ -1533,6 +1533,8 @@ static int handle_aiocb_write_zeroes(void *opaque) s->has_discard = false; } } +#else + s->has_discard = false; #endif #ifdef CONFIG_FALLOCATE @@ -1546,6 +1548,8 @@ static int handle_aiocb_write_zeroes(void *opaque) } s->has_fallocate = false; } +#else + s->has_fallocate = false; #endif return -ENOTSUP;