From patchwork Tue Feb 1 18:20:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 538956 Delivered-To: patch@linaro.org Received: by 2002:a5d:59ac:0:0:0:0:0 with SMTP id p12csp1050289wrr; Tue, 1 Feb 2022 12:44:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyz6eKzvY8l6qT/hTYUJ6Edcd27yD6Q4SuFUEVnRQSoxPzKsdQ1GR6a4nvOZZGdr4eAtPwx X-Received: by 2002:a05:6902:120c:: with SMTP id s12mr39686920ybu.66.1643748282157; Tue, 01 Feb 2022 12:44:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1643748282; cv=none; d=google.com; s=arc-20160816; b=SrfGvZZxgkR8dKQjMBv0M5gt1gLAzP1QHisNqqA/kZghS/DSS2guitNaCEQSesTtOB UNvhE/YNrHNkcERItf2U3KQyKF7DXu2DI378yLtbAfUO4YPapDY8mD5ibFkh5PmNzYEL rSQiRJQVwusLANtU5grd4Q2nHQwRtq8m8d/o+Y4qQ76VdpC6to7DNE+ytyhyZ97AA4ZU ZJs/974SwcAVJ8oHr05i4VbU68fRuoWQ/1WfkWTIFDlFMcQa92dOQYUepLmDGby7vKNW ZOaiOWmtOwcLabJmXvTz8owhscq67cxWVqXeZBMspieqtqtNlHnZm2DkY8RfuLkNjjRB Smow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=+TZjr7w9Hd6JZaVgTs5fEwS15BZhJQxhutquuynkbQQ=; b=vOIdrHuVWu5Y1K1RLyAtDxDClPVQYzS4lLBxix6JibwhjGAJlcjzjzYVCam7qGxzPb prGubAmuIUg8zxTozTJdsBTohDFsJ5Ah2DK+l7gIgQxcqsdg6Oz4fzDv2IitEKJeC/Ug XFPjkjWW3ujatS1kBPVhUih/BonLLYmKdIULz7tk1OltyoJZwLJFPJWWN4XN1N12QxwF wChmYp21DiC9KYGDhupPUlLyzW4qZ5XCpkPBF/oUHBU0lVAJbFdeTUtaFVCxUxQ3OLgI zJx6rkt0dpNbO4E3dTOvUd5TeOio9ciIT78w7I1Qkgw+MpHk3nZXa5Lh/tdD3aOfU3In FwLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=phcxV2wV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id a8si16103411ybg.285.2022.02.01.12.44.42 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 01 Feb 2022 12:44:42 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=phcxV2wV; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:41434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nF013-00023T-Hy for patch@linaro.org; Tue, 01 Feb 2022 15:44:41 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44294) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nExnX-0008Cv-5Q for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:22:36 -0500 Received: from [2a00:1450:4864:20::636] (port=42868 helo=mail-ej1-x636.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nExmZ-0000f1-Ui for qemu-devel@nongnu.org; Tue, 01 Feb 2022 13:21:41 -0500 Received: by mail-ej1-x636.google.com with SMTP id m4so56932296ejb.9 for ; Tue, 01 Feb 2022 10:21:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+TZjr7w9Hd6JZaVgTs5fEwS15BZhJQxhutquuynkbQQ=; b=phcxV2wVubU5kFqiurq0Cl29kCy0Kf/H4xeLkQSeoPvOt1i5PNHiicdhy3XuDqcMd/ Q51qtavyw8S6wMo6wE6L/ImzhFKFRlL3j1sGVlE2HDfeQRYuCcuYYgidUy4Eqh535q5I ls4j/PCzL1V4xaJmk7gXOvF7T+QCywM6wnvxBHFNqV3H0oXriulSjsKkOEAEPhWdHlg+ HG0bpAjUa+Z4yBZbE2cUwc6HTysBIGbxwFzX+9QU3ajHfipVCB+Hptu1obJYtutICkU4 u2MEaEe5Zm/wDzIC0POAVbs6ts+E6nsUPJ4Slaw6oMIFVfmsX3TvV9yL/m8UIbfbNUUU b8Iw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+TZjr7w9Hd6JZaVgTs5fEwS15BZhJQxhutquuynkbQQ=; b=QqAYKfl75TCmr0wUYTeG/UOWf0Szvxx1yVbIvGV/2MtHtrHyqxzY9lvi0VXYqxbmFr 7N8UOr97y7nbwBu4Hah3h6/5e6Q+sqwvrPggx3Lbk9RvF7oY/iftLHx8SwfT55bg0+H4 tQs0cFix3I2PiaPlG6B90W2ccezOMNvTFnxdShF5ZevaKODn1UeYPV0uT/A5aSUKSy2s YBXwj9Oee3dpZiaLW70TSX2e//9ZgHJk0pfQOmcXZzoYkz3TR1zT9/MbO7AAFt93dVBW cDsqjvjTGVbIgidrU68efnNAlewBvtBLSUuRBI0eLN7/XJnhH3Zv6+Gq+j5z70JVH5n8 3S4A== X-Gm-Message-State: AOAM5323vtMBLjETV2i14d/Vo2iRcAveTw82z/Oa4Pdq+LmfQyQgWC5G 3tmjnN5uI0vFd+LM78nQyu+5LQ== X-Received: by 2002:a17:907:72c6:: with SMTP id du6mr22862141ejc.224.1643739671914; Tue, 01 Feb 2022 10:21:11 -0800 (PST) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id bl12sm14818961ejb.75.2022.02.01.10.20.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Feb 2022 10:21:08 -0800 (PST) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1DEB31FFC7; Tue, 1 Feb 2022 18:20:52 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 15/25] block: fix FreeBSD build failure with fallocate Date: Tue, 1 Feb 2022 18:20:40 +0000 Message-Id: <20220201182050.15087-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220201182050.15087-1-alex.bennee@linaro.org> References: <20220201182050.15087-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::636 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::636; envelope-from=alex.bennee@linaro.org; helo=mail-ej1-x636.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: fam@euphon.net, Hanna Reitz , berrange@redhat.com, stefanha@redhat.com, "open list:FUSE block device..." , crosa@redhat.com, aaron@os.amperecomputing.com, robhenry@microsoft.com, f4bug@amsat.org, mahmoudabdalghany@outlook.com, minyihh@uci.edu, cota@braap.org, Luke.Craig@ll.mit.edu, pbonzini@redhat.com, kuhn.chenqun@huawei.com, ma.mandourr@gmail.com, Kevin Wolf , =?utf-8?q?Alex_Benn?= =?utf-8?q?=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We already use the CONFIG_FALLOCATE_PUNCH_HOLE symbol elsewhere in the code so use it here. Fixes: 4ca37a96a7 ("fuse: (Partially) implement fallocate()") Cc: Hanna Reitz Signed-off-by: Alex Bennée --- block/export/fuse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/export/fuse.c b/block/export/fuse.c index 6710d8aed8..7ed69c4a05 100644 --- a/block/export/fuse.c +++ b/block/export/fuse.c @@ -625,6 +625,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode, return; } +#ifdef CONFIG_FALLOCATE_PUNCH_HOLE if (mode & FALLOC_FL_KEEP_SIZE) { length = MIN(length, blk_len - offset); } @@ -643,6 +644,7 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode, length -= size; } while (ret == 0 && length > 0); } +#endif #ifdef CONFIG_FALLOCATE_ZERO_RANGE else if (mode & FALLOC_FL_ZERO_RANGE) { if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) {