From nobody Thu May 2 10:34:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) client-ip=209.85.221.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=quarantine dis=quarantine) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1642859385; cv=none; d=zohomail.com; s=zohoarc; b=d1Z0Fv0U+OaWeSHUvRqdncIAdgQSUMqln99wExWbrAPKjXNFDezRlyV3C2euBncCaLYUGEl4rdTffhpTIGj0BeXcmwK/r9CEVL3riFfIEC3+cM82VF+KjMGblM1Ib5xB07sLwoDjqPCxCWjBks9Cxy12KAhWrKtRWXvwRcNsMvc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1642859385; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Sender:Subject:To; bh=jzIQf/rh1owyVHr6I4A+AYUYYZWY8UGDu4j+mQfBMHQ=; b=QsBmsTq4MZ+2QTBXfiw+yqNdiw6jMhx0riKVMgtDKuZH+KrFpCPoeHEvVvg3hZKactPKRM7QAuCn+krqYwcCnkRhljs4wr8tza3tT99r0YXtkMbLx4F30GO2uGCMhrm8E2Bcm/PbayCOjd+v7BvluxBQ13vEHNrl5SeDc8d9SbY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) by mx.zohomail.com with SMTPS id 1642859385560741.5794834341219; Sat, 22 Jan 2022 05:49:45 -0800 (PST) Received: by mail-wr1-f43.google.com with SMTP id s18so4979879wrv.7 for ; Sat, 22 Jan 2022 05:49:45 -0800 (PST) Return-Path: Return-Path: Received: from nuc.. (154.red-83-50-83.dynamicip.rima-tde.net. [83.50.83.154]) by smtp.gmail.com with ESMTPSA id l15sm12972415wmh.6.2022.01.22.05.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 22 Jan 2022 05:49:42 -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:mime-version :content-transfer-encoding; bh=jzIQf/rh1owyVHr6I4A+AYUYYZWY8UGDu4j+mQfBMHQ=; b=MJXfQfDMSez4GRSutlMlOLi8/OAY7hqSX8W+/gFi25aBJGjjeGyLak27MWMz1lQuwq Vfm+kTtspMva6v2S4mh5HOMYoOkNnNrMdOkFGf8jWLSsCIUUfSus8HQ8hP6O+7qA4tiJ k34EzVhvgqTwFwvoViloQjX8A73cQAqB3xJaJ2GImLqL6cnAV3lmRzS8FidgQA/2jHBX nEJkU8oPaRsdiSisheLbUt24FtDSxnnuibMAWC9jbUY+8yjW2dGFbz+DIZiosrqxswrS khg3vEc13Ucx/qb5ahDKP8/ew0JNHHWC+IzQVdGmXqp3BmPL4jPwT4v/fPBON0W28TjM ui8Q== 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 :mime-version:content-transfer-encoding; bh=jzIQf/rh1owyVHr6I4A+AYUYYZWY8UGDu4j+mQfBMHQ=; b=Kyuihrs3dFL4t9OPoTewlMu98H0JZbroKUQK62giaW4JHF3TQ30fG4NiEyRfDaGYu8 DRd6UjrDmS++BIEooG+k3U2Jb2/MgQlsZwr1ZuwhiraeDfPeDkt124uZm/K5ZoFWWqWe INPARPYDGD7xBex2qIGMN65jiQEjPJzUW4d/4GoOIcqmXZAjtq20UyjGxtdiyq25+FVS SgX9XpN5qhD8TAFXXBC/U1dxVg5RBYXFdCKnvSUcLt1TU85U+OiD+HyxXSM91VrjxPEq KVvcT6bTGVZCF52+/fg3+b+jyjnJPwzWvAszQwQzI1XFuSZ9gPjjx8f5Cpzp2U8PQHeC jcEw== X-Gm-Message-State: AOAM530QJbfmTc0GxeZRYx+kg4x/EBBd+vgaVgkTn6XePutvvK0YzMBb c0DSN2UcpNU/xAXFTM7t0sU= X-Google-Smtp-Source: ABdhPJwhuuk69np9+KDnQRmNLLT5jAHb9tvrDjL+PQzGhtQpZYthZCF5Pr2Bre7QqqmVHUQ2jDQw0Q== X-Received: by 2002:a5d:4ac2:: with SMTP id y2mr7471258wrs.587.1642859383718; Sat, 22 Jan 2022 05:49:43 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , Fabrice Fontaine , qemu-block@nongnu.org, Ed Maste , Li-Wen Hsu , Kevin Wolf , Kyle Evans , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH] block/export/fuse: Fix build failure on FreeBSD Date: Sat, 22 Jan 2022 14:49:40 +0100 Message-Id: <20220122134940.401590-1-f4bug@amsat.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1642859387672100001 When building on FreeBSD we get: [816/6851] Compiling C object libblockdev.fa.p/block_export_fuse.c.o ../block/export/fuse.c:628:16: error: use of undeclared identifier 'FALLO= C_FL_KEEP_SIZE' if (mode & FALLOC_FL_KEEP_SIZE) { ^ ../block/export/fuse.c:632:16: error: use of undeclared identifier 'FALLO= C_FL_PUNCH_HOLE' if (mode & FALLOC_FL_PUNCH_HOLE) { ^ ../block/export/fuse.c:633:22: error: use of undeclared identifier 'FALLO= C_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=C3=A9 --- Fragile #ifdef'ry... Any clever idea? ERROR: else should follow close brace '}' #17: FILE: block/export/fuse.c:647: } + else ERROR: else should follow close brace '}' #29: FILE: block/export/fuse.c:670: } + else total: 2 errors, 0 warnings, 28 lines checked --- block/export/fuse.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/block/export/fuse.c b/block/export/fuse.c index 6710d8aed86..d8bad0e53df 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 i= node, int mode, return; } =20 +#ifdef CONFIG_FALLOCATE_PUNCH_HOLE if (mode & FALLOC_FL_KEEP_SIZE) { length =3D MIN(length, blk_len - offset); } @@ -643,8 +644,10 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t = inode, int mode, length -=3D size; } while (ret =3D=3D 0 && length > 0); } + else +#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */ #ifdef CONFIG_FALLOCATE_ZERO_RANGE - else if (mode & FALLOC_FL_ZERO_RANGE) { + 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 =3D fuse_do_truncate(exp, offset + length, false, @@ -664,8 +667,9 @@ static void fuse_fallocate(fuse_req_t req, fuse_ino_t i= node, int mode, length -=3D size; } while (ret =3D=3D 0 && length > 0); } + else #endif /* CONFIG_FALLOCATE_ZERO_RANGE */ - else if (!mode) { + if (!mode) { /* We can only fallocate at the EOF with a truncate */ if (offset < blk_len) { fuse_reply_err(req, EOPNOTSUPP); --=20 2.34.1