From patchwork Mon Jan 24 22:03:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12722981 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 47D20C433F5 for ; Mon, 24 Jan 2022 22:05:33 +0000 (UTC) Received: from localhost ([::1]:42040 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC7Su-0001a4-AO for qemu-devel@archiver.kernel.org; Mon, 24 Jan 2022 17:05:32 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34168) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC7RY-0007pb-8p; Mon, 24 Jan 2022 17:04:08 -0500 Received: from [2a00:1450:4864:20::331] (port=42690 helo=mail-wm1-x331.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC7RW-0002e2-OY; Mon, 24 Jan 2022 17:04:07 -0500 Received: by mail-wm1-x331.google.com with SMTP id f202-20020a1c1fd3000000b0034dd403f4fbso379934wmf.1; Mon, 24 Jan 2022 14:04:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jCpAbYC9T6HGGGxeJ6RsbykRgxprtZ2L9dWFhM1DvkI=; b=ZRG/7gTbKDEQcoa4qoMuGFIkGHQWUo6ODlAtlD+eH7Kb2ebxfDI1I5A79xLenHqCRi lEPoEBfQDaaKWFOs7AZjDfJbcjbvBCxgTt3TnQKFrNJ4Q0mqAh26x0nWMTVHrNPdYYFC e2OxDLgtP8/8PjRbg/9xTkb91/pm9WRyWojEPuTemqbgS/DErxFFBfpstEkMKePNOnf2 AfGcm2kjcjzng4mtGRvvD7wZf0TDoIWCprkWnB9XAYVAHGtyv1w4+FJ28lWkyXhkZg6O HOZYOqwPmGQunDhvk00dJLTCtdpft81rQm+tUtbrrSQMSl6eC8Gy9nO9Hgda1vkordNY 6yYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=jCpAbYC9T6HGGGxeJ6RsbykRgxprtZ2L9dWFhM1DvkI=; b=ZXxcbciXeGyhc+u1ddkEIIpLxbedw4QJ/6SxwdxwwVMUmGD2AfbZuBHtspdLBm5SdG TlzEsYPv9gFICxtyZU4SRuK8sopKOSreMcYi+1Q/gxqeLty+nHQfYRtIenT5urIeMUIp p0YjWRMrF4OfQLZjyg39YwMV+9ZIkmxJLDEG8kuxvBPNG3irOWvYc95MZZBMdZo93b/u 60r2z5MRiTdRiHbcB3pFT9MUSihcbPw+csa11xzCbVflVEyFd545UL74w5g1zFbMeX1f 7AcijHZjlmjT81LDuAj9K6DaJr7DO9KhwOI4cUk8chnZH5013K/Bxv3bJSeOIcpNmWBy rIjA== X-Gm-Message-State: AOAM5325Pw0lTKq/iAOs5unhgiLSBcjPtWbY5GU0b5Cc6IgFq6XvHhRp SsT7EfMDSAUcszYddxzU8kspynrsI4A= X-Google-Smtp-Source: ABdhPJyWrY27BXp2jjCW7SuvOQus5YVR8Z3lHKN6oGuHYajf4VyyuMk5+OqtkXOu1a+Alda1A9MYOA== X-Received: by 2002:a05:600c:3b9c:: with SMTP id n28mr256473wms.128.1643061844950; Mon, 24 Jan 2022 14:04:04 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id j3sm563161wrb.111.2022.01.24.14.04.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 14:04:04 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Li-Wen Hsu , Ed Maste , Kyle Evans , Fabrice Fontaine , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH v2 1/3] block/export/fuse: Extract fuse_fallocate_punch_hole() Date: Mon, 24 Jan 2022 23:03:55 +0100 Message-Id: <20220124220357.74017-2-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124220357.74017-1-f4bug@amsat.org> References: <20220124220357.74017-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::331 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x331.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, 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 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Extract fuse_fallocate_punch_hole() to avoid #ifdef'ry mixed within if/else statement. Signed-off-by: Philippe Mathieu-Daudé --- block/export/fuse.c | 59 +++++++++++++++++++++++++++------------------ 1 file changed, 35 insertions(+), 24 deletions(-) diff --git a/block/export/fuse.c b/block/export/fuse.c index 6710d8aed86..31cb0503adc 100644 --- a/block/export/fuse.c +++ b/block/export/fuse.c @@ -603,6 +603,38 @@ static void fuse_write(fuse_req_t req, fuse_ino_t inode, const char *buf, } } +static bool fuse_fallocate_zero_range(fuse_req_t req, fuse_ino_t inode, + int mode, int64_t blk_len, + off_t offset, off_t *length) +{ +#ifdef CONFIG_FALLOCATE_ZERO_RANGE + FuseExport *exp = fuse_req_userdata(req); + + if (mode & FALLOC_FL_ZERO_RANGE) { + int ret; + + if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + *length > blk_len) { + /* No need for zeroes, we are going to write them ourselves */ + ret = fuse_do_truncate(exp, offset + *length, false, + PREALLOC_MODE_OFF); + if (ret < 0) { + fuse_reply_err(req, -ret); + return false; + } + } + + do { + int size = MIN(*length, BDRV_REQUEST_MAX_BYTES); + + ret = blk_pwrite_zeroes(exp->common.blk, offset, size, 0); + offset += size; + *length -= size; + } while (ret == 0 && *length > 0); + } +#endif /* CONFIG_FALLOCATE_ZERO_RANGE */ + return true; +} + /** * Let clients perform various fallocate() operations. */ @@ -642,30 +674,9 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode, offset += size; length -= size; } while (ret == 0 && length > 0); - } -#ifdef CONFIG_FALLOCATE_ZERO_RANGE - else if (mode & FALLOC_FL_ZERO_RANGE) { - if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + length > blk_len) { - /* No need for zeroes, we are going to write them ourselves */ - ret = fuse_do_truncate(exp, offset + length, false, - PREALLOC_MODE_OFF); - if (ret < 0) { - fuse_reply_err(req, -ret); - return; - } - } - - do { - int size = MIN(length, BDRV_REQUEST_MAX_BYTES); - - ret = blk_pwrite_zeroes(exp->common.blk, - offset, size, 0); - offset += size; - length -= size; - } while (ret == 0 && length > 0); - } -#endif /* CONFIG_FALLOCATE_ZERO_RANGE */ - else if (!mode) { + } else if (!fuse_fallocate_zero_range(req, inode, blk_len, mode, offset, &length)) { + return; + } else if (!mode) { /* We can only fallocate at the EOF with a truncate */ if (offset < blk_len) { fuse_reply_err(req, EOPNOTSUPP); From patchwork Mon Jan 24 22:03:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12722983 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id E96EEC433F5 for ; Mon, 24 Jan 2022 22:08:14 +0000 (UTC) Received: from localhost ([::1]:47486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC7VV-0005H3-Sh for qemu-devel@archiver.kernel.org; Mon, 24 Jan 2022 17:08:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34184) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC7Rd-00080F-CP; Mon, 24 Jan 2022 17:04:19 -0500 Received: from [2a00:1450:4864:20::42a] (port=42845 helo=mail-wr1-x42a.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC7Rb-0002eF-QH; Mon, 24 Jan 2022 17:04:13 -0500 Received: by mail-wr1-x42a.google.com with SMTP id a13so16216154wrh.9; Mon, 24 Jan 2022 14:04:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GxgxCKBNiYaOgKMIodc6FSbutjGheMIARQqSurJB4ww=; b=lP45yiopRyZwkNsT5s1BXrR7tdQ9YDkpkzQWytjGh10PAM468O9wEjNjNNYiCYYrx+ 64GGfd87Pf5pHh3UkeKACLjxXg6jP8BP+E6K5Tew7vpOg3LyYGJeS8owzXTM4QgNMykK TmJ++nt2EhKcllb7O/dy9I6iv4KZ43/L/YN3c1XJoATFJe2LZ4+RQiZ0jnsf/oxeuc6T 63KUI6ZlCxHUoC0193qocdTQV+E/9gbtU5e1BC2xVkiSunlJdXgChONRDcTzz0nUI4df gEERKOvlmSGX/yby5jGo+9MY0Qfkoa4E4Css9ivKGTLXBhAtjF6vYlza1AYqDokXCupp Xa0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=GxgxCKBNiYaOgKMIodc6FSbutjGheMIARQqSurJB4ww=; b=1vw06LKoW+oFJOIsRAWuSO7hX/tjLwDu1S1tbg8aAIgGOEkaGAWwzUilnCJVDk+Ypk JchKcyx4b8ruI6rYOF38gdRpBSjQqI4w0DxcMlayEUI8sdcCF95JyEgPhbQKYgWuYhdG 0wwERHO4sxK207M0/FipUxDU1MKZEn8rrYt6OW/gv/uMIwsGQ+FOpP48aBubfcbdLvTU CUUdsDT5PEKb15T12x+fv4uToawdwPjCZHrEa4w3IwtN+n7NcinYbn5Q3/oaVTwT+HFS WHWB4SbUtM3t6b1IZablkACUbCEiBOI8vWV0Kyhem4OZVaxF4TuVuAQIN1j6n6OjS8Xh W+RQ== X-Gm-Message-State: AOAM531gIRheFJGESYmKswpOVO8qhs73f7N8ErCFR01ZuVvsevarlpXc rM31HGafJQL8U/9EvPGfqRp4TL6uHqQ= X-Google-Smtp-Source: ABdhPJwfCjxkS+vM/tl6CgDiosxyeuK7yJQjK7k7u868WS4X33a8np34n63yl4huBisZg6j7MXHvNw== X-Received: by 2002:a05:6000:168c:: with SMTP id y12mr9019630wrd.365.1643061849872; Mon, 24 Jan 2022 14:04:09 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id g13sm7598437wri.50.2022.01.24.14.04.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 14:04:09 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Li-Wen Hsu , Ed Maste , Kyle Evans , Fabrice Fontaine , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH v2 2/3] block/export/fuse: Extract fuse_fallocate_zero_range() Date: Mon, 24 Jan 2022 23:03:56 +0100 Message-Id: <20220124220357.74017-3-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124220357.74017-1-f4bug@amsat.org> References: <20220124220357.74017-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::42a (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-x42a.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, 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 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Signed-off-by: Philippe Mathieu-Daudé --- block/export/fuse.c | 48 +++++++++++++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/block/export/fuse.c b/block/export/fuse.c index 31cb0503adc..3a158342c75 100644 --- a/block/export/fuse.c +++ b/block/export/fuse.c @@ -603,6 +603,35 @@ static void fuse_write(fuse_req_t req, fuse_ino_t inode, const char *buf, } } +static bool fuse_fallocate_punch_hole(fuse_req_t req, fuse_ino_t inode, + int mode, int64_t blk_len, + off_t offset, off_t *length) +{ + FuseExport *exp = fuse_req_userdata(req); + + if (mode & FALLOC_FL_KEEP_SIZE) { + *length = MIN(*length, blk_len - offset); + } + + if (mode & FALLOC_FL_PUNCH_HOLE) { + int ret; + + if (!(mode & FALLOC_FL_KEEP_SIZE)) { + fuse_reply_err(req, EINVAL); + return false; + } + + do { + int size = MIN(*length, BDRV_REQUEST_MAX_BYTES); + + ret = blk_pdiscard(exp->common.blk, offset, size); + offset += size; + *length -= size; + } while (ret == 0 && *length > 0); + } + return true; +} + static bool fuse_fallocate_zero_range(fuse_req_t req, fuse_ino_t inode, int mode, int64_t blk_len, off_t offset, off_t *length) @@ -657,23 +686,8 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t inode, int mode, return; } - if (mode & FALLOC_FL_KEEP_SIZE) { - length = MIN(length, blk_len - offset); - } - - if (mode & FALLOC_FL_PUNCH_HOLE) { - if (!(mode & FALLOC_FL_KEEP_SIZE)) { - fuse_reply_err(req, EINVAL); - return; - } - - do { - int size = MIN(length, BDRV_REQUEST_MAX_BYTES); - - ret = blk_pdiscard(exp->common.blk, offset, size); - offset += size; - length -= size; - } while (ret == 0 && length > 0); + if (!fuse_fallocate_punch_hole(req, inode, mode, blk_len, offset, &length)) { + return; } else if (!fuse_fallocate_zero_range(req, inode, blk_len, mode, offset, &length)) { return; } else if (!mode) { From patchwork Mon Jan 24 22:03:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 12722982 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE7D6C433F5 for ; Mon, 24 Jan 2022 22:05:53 +0000 (UTC) Received: from localhost ([::1]:43224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nC7TE-0002Ny-Is for qemu-devel@archiver.kernel.org; Mon, 24 Jan 2022 17:05:52 -0500 Received: from eggs.gnu.org ([209.51.188.92]:34232) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nC7Rm-0008B0-0W; Mon, 24 Jan 2022 17:04:22 -0500 Received: from [2a00:1450:4864:20::32c] (port=39644 helo=mail-wm1-x32c.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nC7Rj-0002ee-Nx; Mon, 24 Jan 2022 17:04:21 -0500 Received: by mail-wm1-x32c.google.com with SMTP id o1-20020a1c4d01000000b0034d95625e1fso292132wmh.4; Mon, 24 Jan 2022 14:04:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5AdcXoGA0kc+PucyNi/OH/xXSRQhpqTg9YQpTC0NHdk=; b=ZCvmbXHcerVeFZJlTMPOcCoQ7ywbnx/kikB/K1H85cuRI947JoZw20MZ02RU0/fyGI ohBBBAohJPxhAd6L9AuFzM81gYq0c1onisYsFCRfnacM2qU/bIfaJZWMGJzf0NzklNDc qN8IMsIqd8rftzmsycQNhuiZWwb3Y8p+kmaiMGkcusB0/yAT6Yjb0T1nGauZo9bbErTR 33S+Z6YypXRGT0iyZ0rx5yhyfK59U0b4zsWsLZlJg7y4RIUDz+wIaSkB/8+LF+qGNpyw VK3CzjCstg+Jt/2oj/J/HW77EFmlSg7rIdAnCiMnmdDNINcIpPaFRTFqj206YZN65DWR LFKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=5AdcXoGA0kc+PucyNi/OH/xXSRQhpqTg9YQpTC0NHdk=; b=zXysJoYKJH4Znt4Lae+GS8goiSVNjWeo6PLAlzBCS/zv50gxjIgYxLgD9e+f/ZecvP wXwQhcxr3kZGcqLwGOt0oyV6f7AkVw9d3Z/c6t6N640xXtnfrlwjX0OHsMM9HkCTOYdv pxBllAQpiQb/6N86j6qSNHDEI8QoXCDpb49QUpo0bg672aBRGA8upRN1J2XTYQx0DMDO TJ8MskY86edG/qe6zNrJSsnDyxOUyvRAZXs84GqZNc8rKkqVCYeeMKKF32qX860+3YMo 8wk819MAEeeygYCu+kn6BwU/SNoT4WtJGZam/fLwQQA4a1z+wATVA4xrRsRt+/swe1Ch 8MOw== X-Gm-Message-State: AOAM532p0ei9i0fap0ARmX59O6XLhvWWm+rj84HKM+xlgVPxLH/IJaE2 ADWb+2zzYO6vp3ZzdS6w1jKV7n73Bd0= X-Google-Smtp-Source: ABdhPJy/BwEqc+Y6Ffn/QdJHd1kgU1zIQ2tJVqGYYs9LweNSs/I0Zz76MzxUJ8gjtcn7e6rz2iYgSw== X-Received: by 2002:a05:600c:4101:: with SMTP id j1mr296977wmi.28.1643061854779; Mon, 24 Jan 2022 14:04:14 -0800 (PST) Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id y2sm477336wmj.13.2022.01.24.14.04.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Jan 2022 14:04:14 -0800 (PST) To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Li-Wen Hsu , Ed Maste , Kyle Evans , Fabrice Fontaine , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= Subject: [PATCH v2 3/3] block/export/fuse: Fix build failure on FreeBSD Date: Mon, 24 Jan 2022 23:03:57 +0100 Message-Id: <20220124220357.74017-4-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220124220357.74017-1-f4bug@amsat.org> References: <20220124220357.74017-1-f4bug@amsat.org> MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::32c (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::32c; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-x32c.google.com X-Spam_score_int: -6 X-Spam_score: -0.7 X-Spam_bar: / X-Spam_report: (-0.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FORGED_FROMDOMAIN=0.248, FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.249, 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 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Reply-to: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Original-From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= via From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= When building on FreeBSD we get: [816/6851] Compiling C object libblockdev.fa.p/block_export_fuse.c.o ../block/export/fuse.c:612:16: error: use of undeclared identifier 'FALLOC_FL_KEEP_SIZE' if (mode & FALLOC_FL_KEEP_SIZE) { ^ ../block/export/fuse.c:616:16: error: use of undeclared identifier 'FALLOC_FL_PUNCH_HOLE' if (mode & FALLOC_FL_PUNCH_HOLE) { ^ ../block/export/fuse.c:619:22: error: use of undeclared identifier 'FALLOC_FL_KEEP_SIZE' if (!(mode & FALLOC_FL_KEEP_SIZE)) { ^ 3 errors generated. FAILED: libblockdev.fa.p/block_export_fuse.c.o Meson indeed reported FALLOC_FL_PUNCH_HOLE is not available: C compiler for the host machine: cc (clang 10.0.1 "FreeBSD clang version 10.0.1") Checking for function "fallocate" : NO Checking for function "posix_fallocate" : YES Header has symbol "FALLOC_FL_PUNCH_HOLE" : NO Header has symbol "FALLOC_FL_ZERO_RANGE" : NO ... Similarly to commit 304332039 ("block/export/fuse.c: fix musl build"), guard the code requiring FALLOC_FL_KEEP_SIZE / FALLOC_FL_PUNCH_HOLE definitions under CONFIG_FALLOCATE_PUNCH_HOLE #ifdef'ry. Signed-off-by: Philippe Mathieu-Daudé --- block/export/fuse.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/block/export/fuse.c b/block/export/fuse.c index 3a158342c75..4c5d662be87 100644 --- a/block/export/fuse.c +++ b/block/export/fuse.c @@ -607,6 +607,7 @@ static bool fuse_fallocate_punch_hole(fuse_req_t req, fuse_ino_t inode, int mode, int64_t blk_len, off_t offset, off_t *length) { +#ifdef CONFIG_FALLOCATE_PUNCH_HOLE FuseExport *exp = fuse_req_userdata(req); if (mode & FALLOC_FL_KEEP_SIZE) { @@ -629,6 +630,7 @@ static bool fuse_fallocate_punch_hole(fuse_req_t req, fuse_ino_t inode, *length -= size; } while (ret == 0 && *length > 0); } +#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */ return true; }