From nobody Fri May 3 03:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) client-ip=209.85.128.43; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f43.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.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=1643061846; cv=none; d=zohomail.com; s=zohoarc; b=X29L8mqO2lNbh/jCcEWZG2zdJV5gWgZmkosebXe6RGshAUMuO9rYw2ka3aVS3YwiZ/onsQiSL+rRboBDwaXTfBRduRl7BgFLXrNA88t4CtQDazRJHqh3bhea1YpRlb6+vK6IuUlP4roaB7iA13KBnp7mBcJuBXsGQFa6w+tc6jQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643061846; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=jCpAbYC9T6HGGGxeJ6RsbykRgxprtZ2L9dWFhM1DvkI=; b=aZzdADg658S3/sIkyztJYdVHtdTN/nA8HoE8XPXNa+KA/MKTSfsy6V5TUYLIiI5XGDbrDAGcVJFWzQFLRD8dTqv0GTn3z3VwX/8BgAfnT5qzkXHUvSm93c3BWrgc/9iOMO/Sfz/CSwIYFGfKfiYqA8YZgxpZyOl4EL2zpH2rR3k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mx.zohomail.com with SMTPS id 1643061846423118.39837170626686; Mon, 24 Jan 2022 14:04:06 -0800 (PST) Received: by mail-wm1-f43.google.com with SMTP id l35-20020a05600c1d2300b0034d477271c1so373626wms.3 for ; Mon, 24 Jan 2022 14:04:05 -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 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) 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=KkDiss9WxGyhd29Cb/n/R/CW4ZpsGRKh0f+o9HZWVafWIBqxpLbUkLW46wvJjD9lsS 0e6aMao+983KJ2QnZS3fs9+L1ucd9bd8mYktVukUiZSy1m5hWEF1XMPFPoZ+cb9zkfed hLtGyr5su0KGK7qTORHiOOZoSJUQ/ScjmLK4ndV1Pbw34AB+NDYJpb06XowQciVhcw4Q lnKvW/cgajKQyfmFMT7DWzFnEP4ul7oV0ZmDF2/mzefVpeh46yEQD8JSVlZ0qTTeusCD YwufIyEGs9wtZV0iadhXaIGc5ac0OLgG8FuJ+Yqqdjj9SGhxoeuYkwQYIhVNwuPwuGpp NPOw== X-Gm-Message-State: AOAM530i+ChYdrB8H+UdDZF58x3t+M39WdedAVLsrPKqTGH4GbSsXRs/ 9G2ngWMTAxBx3SgtZSa8FzrIlrPMGq0= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Li-Wen Hsu , Ed Maste , Kyle Evans , Fabrice Fontaine , =?UTF-8?q?Philippe=20Mathieu-Daud=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1643061849016100001 Extract fuse_fallocate_punch_hole() to avoid #ifdef'ry mixed within if/else statement. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 inod= e, const char *buf, } } =20 +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 =3D 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 =3D fuse_do_truncate(exp, offset + *length, false, + PREALLOC_MODE_OFF); + if (ret < 0) { + fuse_reply_err(req, -ret); + return false; + } + } + + do { + int size =3D MIN(*length, BDRV_REQUEST_MAX_BYTES); + + ret =3D blk_pwrite_zeroes(exp->common.blk, offset, size, 0); + offset +=3D size; + *length -=3D size; + } while (ret =3D=3D 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 +=3D size; length -=3D size; } while (ret =3D=3D 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 =3D fuse_do_truncate(exp, offset + length, false, - PREALLOC_MODE_OFF); - if (ret < 0) { - fuse_reply_err(req, -ret); - return; - } - } - - do { - int size =3D MIN(length, BDRV_REQUEST_MAX_BYTES); - - ret =3D blk_pwrite_zeroes(exp->common.blk, - offset, size, 0); - offset +=3D size; - length -=3D size; - } while (ret =3D=3D 0 && length > 0); - } -#endif /* CONFIG_FALLOCATE_ZERO_RANGE */ - else if (!mode) { + } else if (!fuse_fallocate_zero_range(req, inode, blk_len, mode, offse= t, &length)) { + return; + } else 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 From nobody Fri May 3 03:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) client-ip=209.85.221.54; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f54.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 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=1643061851; cv=none; d=zohomail.com; s=zohoarc; b=lPLdCOMUusMXH50YJ+97z4ZliunNU/pj/aRfNZ0aePwPkv0rN0wrretgb8mCzV3HmD2zzDzgtb8SfWwbhrAUXooPW0O4PJX2zaJ3NNGayvOGOL+TnGxN0eJIVU/JV6ZtfJ18WAwvw3b+6CERQBoNIMQRroT/Cjt30eELADrOo14= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643061851; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GxgxCKBNiYaOgKMIodc6FSbutjGheMIARQqSurJB4ww=; b=jna7EQWnyetc47MibI5JMKowQj/7XTzQBrsYSrgvvvkFwAR7CD2aUgKkrp9le94siFnUzxC5CpVGHb/byM9mhncvEoUm37P4RsJviaY/usTYV/7z8NrEEQdTdOfLAsXR+mONotMWwIlcpQRYHaFFCRnOLR7hLtOS63TmD/eSZJQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.54 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by mx.zohomail.com with SMTPS id 1643061851337173.40251398089924; Mon, 24 Jan 2022 14:04:11 -0800 (PST) Received: by mail-wr1-f54.google.com with SMTP id c23so537234wrb.5 for ; Mon, 24 Jan 2022 14:04:10 -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 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) 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=fOWagLy6DPz2rOFMX12TFEYmD4Ovyw2ZRBVvjFq/7bv2q5nVrdJXqVdoHUwFVXymDw aEDw7URpio1h76wFJJdWTAAHeiNEZCirbzTK34eh87NqJEiARptL1m/ILj1vVhKEZ2/A MAEGtpw/MTdxzX0Z8lj1S/krdfoqHUl3/4PVB2s98ligAbgo7LWQNb2fJg8+4RcY6ibg BVD/4RQFizRFBfDBYYBGUYCjRNuAjeIY4j2q9xVT1dFoEBJ37cVhAOxuzX94aK18WIdI WjhDwcUCoVgWYpTiEPOD7rMYieUPkZ9qJy9HmvkR6jldwgIVCB4gc3lqOphrvmA3jdqi Krnw== X-Gm-Message-State: AOAM5310QDoCygD4R/f+dTXnqpeS8sifwoPVh1PYJSJwRAa8a0ebtyep 0/0jR3M91MR04ndxy8u+3cY= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Li-Wen Hsu , Ed Maste , Kyle Evans , Fabrice Fontaine , =?UTF-8?q?Philippe=20Mathieu-Daud=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1643061854028100013 Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- 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 inod= e, const char *buf, } } =20 +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 =3D fuse_req_userdata(req); + + if (mode & FALLOC_FL_KEEP_SIZE) { + *length =3D 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 =3D MIN(*length, BDRV_REQUEST_MAX_BYTES); + + ret =3D blk_pdiscard(exp->common.blk, offset, size); + offset +=3D size; + *length -=3D size; + } while (ret =3D=3D 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; } =20 - if (mode & FALLOC_FL_KEEP_SIZE) { - length =3D 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 =3D MIN(length, BDRV_REQUEST_MAX_BYTES); - - ret =3D blk_pdiscard(exp->common.blk, offset, size); - offset +=3D size; - length -=3D size; - } while (ret =3D=3D 0 && length > 0); + if (!fuse_fallocate_punch_hole(req, inode, mode, blk_len, offset, &len= gth)) { + return; } else if (!fuse_fallocate_zero_range(req, inode, blk_len, mode, offse= t, &length)) { return; } else if (!mode) { --=20 2.34.1 From nobody Fri May 3 03:39:16 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) client-ip=209.85.128.47; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f47.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 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=1643061856; cv=none; d=zohomail.com; s=zohoarc; b=WvTB58a0XmjVVK1K+VZ+wMPQpSsyrdHfSrDySnC+rYKLxbK8EcSuLMRhmaiKdOZypQUzAo68FC/7r1b8WG5dPM8ouZGRrPhPCFhbgNAZGGUb4rSjcVHOCZCE0ebmEf4xcH3rmrc1D5lX241xObo3PdEGUDX5ZqnZUx/jSStcpL0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1643061856; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5AdcXoGA0kc+PucyNi/OH/xXSRQhpqTg9YQpTC0NHdk=; b=P14hKF1dbCTOrpRzjWYlLNVZ0tWnPHlKq9+Ut2Sqkbo4PnYzh3PqPyz2FBoGICJ5+Y+Md5Nov3FvGnVTr3hOItVRm/Hm3J89XGR+wyZPZ9RfCxfhRiHixR+XysvMv41KQL/kgBVOhNtsZ8EfADMFJVbWxH579e8kJ4XkM4IzcNM= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.47 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=quarantine dis=quarantine) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mx.zohomail.com with SMTPS id 1643061856265344.407749249179; Mon, 24 Jan 2022 14:04:16 -0800 (PST) Received: by mail-wm1-f47.google.com with SMTP id r9-20020a1c4409000000b0034e043aaac7so291583wma.5 for ; Mon, 24 Jan 2022 14:04:15 -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 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) 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=1KLtn5UpPub5R84IGnH/j1lqf5fDa02w3zXU1e6t22EX6wOn5HUgEPDr7H3+3MOtnW tSjy2qyWXgSK77UJmrj70eAb2x1SUbm5Cjla6thr4LshCTKIJChIGn/QVkm1evFk2DtS J5KPWppLrHV/x4PunfbxNH0sVsI7XT7icM0wfOW6TQWUkaOMHr+SYLVgHWnz52QdWcw7 FEZMD7VtB/ZVfJKtNKY78A8zViXsl12UhIpe+STuvc0GiPSFZ1tv76Wj+MLFppVOhYpQ 0E6KqhMMftbSgFdvZfL6XK04wHJP3PkqIxlMViujz2EBiLCuvhNYy26dwIeeORNoiQY6 zmng== X-Gm-Message-State: AOAM533eSJ8A8NdJG9Qg2Su3d2Ckd55lSWwEdIfPz76kGhyE9TOLqASP xsGOOFLca1WSp+pQAs/t8UQ= 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) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Li-Wen Hsu , Ed Maste , Kyle Evans , Fabrice Fontaine , =?UTF-8?q?Philippe=20Mathieu-Daud=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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1643061858900100032 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 'FALLO= C_FL_KEEP_SIZE' if (mode & FALLOC_FL_KEEP_SIZE) { ^ ../block/export/fuse.c:616:16: error: use of undeclared identifier 'FALLO= C_FL_PUNCH_HOLE' if (mode & FALLOC_FL_PUNCH_HOLE) { ^ ../block/export/fuse.c:619: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 --- 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, f= use_ino_t inode, int mode, int64_t blk_len, off_t offset, off_t *length) { +#ifdef CONFIG_FALLOCATE_PUNCH_HOLE FuseExport *exp =3D fuse_req_userdata(req); =20 if (mode & FALLOC_FL_KEEP_SIZE) { @@ -629,6 +630,7 @@ static bool fuse_fallocate_punch_hole(fuse_req_t req, f= use_ino_t inode, *length -=3D size; } while (ret =3D=3D 0 && *length > 0); } +#endif /* CONFIG_FALLOCATE_PUNCH_HOLE */ return true; } =20 --=20 2.34.1