From nobody Mon Feb 9 23:38:42 2026 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