From patchwork Tue Dec 18 07:57:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Nefedov X-Patchwork-Id: 1015115 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=2001:4830:134:3::11; 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="b+mvRoGx"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43Jr7v5XgZz9rxp for ; Tue, 18 Dec 2018 19:01:31 +1100 (AEDT) Received: from localhost ([::1]:52374 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZAJl-00011e-2O for incoming@patchwork.ozlabs.org; Tue, 18 Dec 2018 03:01:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gZAG8-0006PI-BW for qemu-devel@nongnu.org; Tue, 18 Dec 2018 02:57:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gZAG6-0003fq-Ma for qemu-devel@nongnu.org; Tue, 18 Dec 2018 02:57:44 -0500 Received: from mail-am5eur03on0728.outbound.protection.outlook.com ([2a01:111:f400:fe08::728]:19870 helo=EUR03-AM5-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 1gZAG6-0003eE-AT; Tue, 18 Dec 2018 02:57:42 -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=Nk5Pq8alT6cyscCTifuw7wNRhjsTHJMsg/SN+QMICm8=; b=b+mvRoGxzxbpIzYKGSPHVfPCTgoFgrobbGir3UNLMX6wZiQ+XYhL8OFSoHGUb9IoHIAcF6tstkg12is8dInKsSU5Akp2WPeCAlY5sNWB0qV/I7GK7sQ98VX4C3qfHhe046lQf8D0Ur0s145Hv+KpjzuYDUfW9LTPdryPvaCSqPc= Received: from AM0PR08MB3347.eurprd08.prod.outlook.com (52.134.94.148) by AM0PR08MB4419.eurprd08.prod.outlook.com (20.179.34.207) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1425.22; Tue, 18 Dec 2018 07:57:40 +0000 Received: from AM0PR08MB3347.eurprd08.prod.outlook.com ([fe80::cceb:42e9:4742:393]) by AM0PR08MB3347.eurprd08.prod.outlook.com ([fe80::cceb:42e9:4742:393%2]) with mapi id 15.20.1425.023; Tue, 18 Dec 2018 07:57:40 +0000 From: Anton Nefedov To: "qemu-devel@nongnu.org" Thread-Topic: [PATCH v11 06/10] file-posix: reset fallocate-related flags without CONFIG_FALLOCATE* Thread-Index: AQHUlqdZFXoiZoW54U6Zq1dDULXYzQ== Date: Tue, 18 Dec 2018 07:57:40 +0000 Message-ID: <20181218075707.12006-7-anton.nefedov@virtuozzo.com> References: <20181218075707.12006-1-anton.nefedov@virtuozzo.com> In-Reply-To: <20181218075707.12006-1-anton.nefedov@virtuozzo.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: HE1P191CA0007.EURP191.PROD.OUTLOOK.COM (2603:10a6:3:cf::17) To AM0PR08MB3347.eurprd08.prod.outlook.com (2603:10a6:208:5f::20) authentication-results: spf=none (sender IP is ) smtp.mailfrom=anton.nefedov@virtuozzo.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [185.231.240.5] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM0PR08MB4419; 20:yin8uVUf/j6jvq69SK1hcw8hXKzOZILi6kD0BRpwZ+2zBqRfbapD3KZIRsavtI3VNBAxyHgLnOA+5I53mrQq90lHI+sn5GBvmBQY6LB0bC+FKDTVfPIaMym9Svxnyhkfd8V6CVHgBEivnDkDdV1qqLPKgT4n3mpgOYzTn+RnoVg= x-ms-office365-filtering-correlation-id: b3b09627-c865-468e-722e-08d664be7bab x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB4419; x-ms-traffictypediagnostic: AM0PR08MB4419: x-microsoft-antispam-prvs: x-ms-exchange-senderadcheck: 1 x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(3230021)(999002)(6040522)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231475)(944501520)(52105112)(148016)(149066)(150057)(6041310)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(201708071742011)(7699051)(76991095); SRVR:AM0PR08MB4419; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB4419; x-forefront-prvs: 08902E536D x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(136003)(396003)(39850400004)(346002)(376002)(366004)(199004)(189003)(8676002)(5660300001)(5640700003)(7736002)(8936002)(4326008)(81166006)(81156014)(14454004)(305945005)(53936002)(97736004)(106356001)(2501003)(68736007)(25786009)(2351001)(105586002)(1076003)(478600001)(386003)(6916009)(66066001)(6506007)(486006)(26005)(76176011)(71190400001)(71200400001)(6486002)(102836004)(575784001)(86362001)(186003)(476003)(6512007)(99286004)(3846002)(6116002)(54906003)(2906002)(2616005)(256004)(11346002)(52116002)(107886003)(446003)(6436002)(36756003)(44832011)(316002); DIR:OUT; SFP:1102; SCL:1; SRVR:AM0PR08MB4419; H:AM0PR08MB3347.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) x-microsoft-antispam-message-info: gCwrqwOLCxtfGMRUoUOwZu32tkn8DxseGqDTJil75p8M90NXWaMv2wqHp///ZDsuKuQZnz2TvtRGfXhtdLjNOkULNg4ydkBr1ZbwkqU5zlWZgmvh1rGKcytrdXl+hUi13N08ye4taFIW5vwh9dHsxDG1oiUSgvUztPfhPQDb+evJFyjvbdhwMcuGwAFsusK0Hr1/zccIhXm+47I9brvUe4Vrl0GzS9YVDoQUccrDzQ8/DNCGduimkKNe/p0UHX1QXLP7bCSmLxMVeLAeYx1mKcYQhEZlpS4AlYImjjgAYxgxFvRlrxKkKqXn/HjJlA8b spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: b3b09627-c865-468e-722e-08d664be7bab X-MS-Exchange-CrossTenant-originalarrivaltime: 18 Dec 2018 07:57:40.3713 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB4419 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 [fuzzy] X-Received-From: 2a01:111:f400:fe08::728 Subject: [Qemu-devel] [PATCH v11 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. Fixing it makes possible to adjust supported zero flag BDRV_REQ_ALLOCATE regardless of configuration (in the following patch). 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 d8f0b93752..a65e464cbc 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;