From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8C95142A783 for ; Mon, 27 Jul 2026 21:25:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785187506; cv=none; b=pL8+GNsRyFexD9Vo0BiXqf/Zebl3NTal6G5guKRimsL9Vri9shNyd1d573GeR8sQUyOfeQmjXX8TQiFHV2ibJltPPBh4MBwB03gMAcYHKwtiVI47WTeIenPGuTEoTlvEMG733xYivwIqgJpsgG838I/QTc2YLjItLQG0W8p/Ozw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785187506; c=relaxed/simple; bh=2UyWaEZMu+4JOZjsadUpJV4QsMl/vanPQVWy4b/+7s8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CIFKRNJhfv4JYZWkwRCElAsp1ZAx+R5wFQNN8d6giRmwK1B7KrazNNeuz5PkuDdFZZ9h9oZSvOaAvCJMF2/Xeeb9emQ4rhVOntR987/W++2ABPwTcieVZ9BJ/WRL+9PbwBifTtKc+F4/UHiYImH020k0jZhYag977eCEwTGtHGw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=EXp0AOEe; arc=none smtp.client-ip=209.85.214.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="EXp0AOEe" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-2cacf197759so45684105ad.2 for ; Mon, 27 Jul 2026 14:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785187503; x=1785792303; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=9VX4eRtECNtngpeRNy7/vdvjlvGkPSiIhLvkw8E1S3w=; b=EXp0AOEe9/K6CK+K1MRAr7giNPsulRs55P9JarEUEm3V+2yfuX1Jp6/nbn2Sw3ytvz gAcbkFDjqtcwROwj5BgLYqXjVDqPV+WQZyvjwF/rDjJsPFoJYMR/W0rUTXClx4DZHIbn 9qke4BTwVRNoZwiKXVEcbQA+o1E6SjEpYpqGITpvcEVCjnM1rkFagmYGwecyFNJCmSPu x+yyJYMEcBT73qMsneB/9dICmoKqeL/90HOQvbpr2phyYLvJNeksDNU16iJXRCJCCOKe YLadKpFR1SuAVr6ecwZz8HXxB71MOzknDffZORwhEgSAChY0p/oDmt6uetG5M8ZUq9N4 26VQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785187503; x=1785792303; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=9VX4eRtECNtngpeRNy7/vdvjlvGkPSiIhLvkw8E1S3w=; b=m81RvFO+m5SbXAmu2ar0AXmxXEw3Gv5uYBTx9g8npOu3jf0LXsfgU+M8KKcqTFPzSs mOmQM9rRpXFBgxa7sAsOCFWKDZsK1xUsJhZG4sSkjTHMZFSA8V25MDRNouBLCk2mSCn1 gB48W7UbhJyxH4TXdKZHgzG1hQws7eN9ew4pKlJzOHc26BV3bH06jyIkMdKMivt/jwOC 5d49MP8aNWslxZHi76RyA4qz7SxyODgxh4mWAZHRZy6Hoe655T7teWSrqe1OVpMiPN3C aac5XnLHKza0tNqKinQnPq0vraEz69GKauacFw2IjDHsSzxTNQ8HPgZMew08oUV9bUfd B/hA== X-Forwarded-Encrypted: i=1; AHgh+RrSu2pQZvrOz3RG34BBGx2k1/jYUu9xydUbuWFULUUF0ksIkBCbLXT0xEOzMOnfymSu1H4GCTbDIow=@vger.kernel.org X-Gm-Message-State: AOJu0YzomQPULA41uCWUdDOIokAev/OSszJfVFCZfIngl3ABlsNlqEuw HeDgIxyYIe1WwvQUPhylKFrzIzqPVhpbuDqde7naHAwakGzTFaJl3tV9 X-Gm-Gg: AR+sD133jbk9lSGxHfUBxxoLdz9QWl2Gauc9WgqLoNXQDAHsLVWIRteeuo7wK5Z/X1Y HlOHKUUAYJavFkP7yNGlkrMMLkhtSND1El6KWDQEdMZyOy85LB8osuKCRqaZB06ipifbvWPDx/v vtX8fklD8J0UUcKbFBFpA44aO4q5917ipsOzGFebLxW3BUDLrcr2sMKFq3v2xsx1YSGRR2ffpI4 J33IXMRbIuj+uxsgD6G8VbBNDSG9U8Agf6SBQ7tsLBd4gvW9JXllGh58Yi4bRMZubh33T2ZVkZD JAJD1AccxzvMWoRWepagcq7vBk5q7ff/+wS5CVBRtJ6wR/DyuHMq2HiKYG88lqzhc5DzE8wiM+R tvU8wBTMqMO2+aUnpj5sENGUPp27IvF5Jyt4MGVRyM63Hi3iZPWvAgwSnKfzKumIp47RYPLuzpO MKCXhNqUm+T2ySObXH59s3NL2E5z8u0kEyH3RpzhHCKGvQhbOM9DrQtg== X-Received: by 2002:a17:902:d4d0:b0:2c0:af09:f3c7 with SMTP id d9443c01a7336-2cfde851c5cmr95616575ad.30.1785187502981; Mon, 27 Jul 2026 14:25:02 -0700 (PDT) Received: from localhost ([2a03:2880:ff:45::]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2cfde5e28easm40897225ad.24.2026.07.27.14.25.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 14:25:02 -0700 (PDT) From: Joanne Koong To: Christian Brauner , hch@lst.de, "Darrick J . Wong" , linux-fsdevel@vger.kernel.org Cc: changfengnan@bytedance.com, kbusch@kernel.org, Matthew Wilcox , Jan Kara , Jonathan Corbet , David Sterba , Gao Xiang , Namjae Jeon , tytso@mit.edu, Jaegeuk Kim , Miklos Szeredi , Andreas Gruenbacher , Mikulas Patocka , Hyunchul Lee , Konstantin Komarov , Carlos Maiolino , Damien Le Moal , libaokun@linux.alibaba.com, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org Subject: [PATCH v4 17/21] fuse: convert iomap ops to ->iomap_next() Date: Mon, 27 Jul 2026 14:17:54 -0700 Message-ID: <20260727211758.1116539-18-joannelkoong@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260727211758.1116539-1-joannelkoong@gmail.com> References: <20260727211758.1116539-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: linux-xfs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert fuse iomap_ops to the new ->iomap_next() callback. Each callback is generated with the DEFINE_IOMAP_ITER_NEXT()/DEFINE_IOMAP_ITER_NEXT_END() macros, which wrap the iomap_iter_next() helper to finish the previous mapping if needed and produce the next one. No functional changes are intended. Signed-off-by: Joanne Koong --- fs/fuse/dax.c | 6 ++++-- fs/fuse/file.c | 4 +++- fs/fuse/virtio_fs.c | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index 8b53625ac7ab..85cdf0199bc0 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -653,9 +653,11 @@ static int fuse_iomap_end(struct inode *inode, loff_t pos, loff_t length, return 0; } +static DEFINE_IOMAP_ITER_NEXT_END(fuse_iomap_next, fuse_iomap_begin, + fuse_iomap_end); + static const struct iomap_ops fuse_iomap_ops = { - .iomap_begin = fuse_iomap_begin, - .iomap_end = fuse_iomap_end, + .iomap_next = fuse_iomap_next, }; static void fuse_wait_dax_page(struct inode *inode) diff --git a/fs/fuse/file.c b/fs/fuse/file.c index ea4a15a7635a..1c346802f877 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -890,8 +890,10 @@ static int fuse_iomap_begin(struct inode *inode, loff_t offset, loff_t length, return 0; } +static DEFINE_IOMAP_ITER_NEXT(fuse_iomap_next, fuse_iomap_begin); + static const struct iomap_ops fuse_iomap_ops = { - .iomap_begin = fuse_iomap_begin, + .iomap_next = fuse_iomap_next, }; struct fuse_fill_read_data { diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c index df25d4faca41..f15e516ebcb5 100644 --- a/fs/fuse/virtio_fs.c +++ b/fs/fuse/virtio_fs.c @@ -1024,8 +1024,7 @@ static void virtio_fs_cleanup_vqs(struct virtio_device *vdev) } /* Map a window offset to a page frame number. The window offset will have - * been produced by .iomap_begin(), which maps a file offset to a window - * offset. + * been produced by .iomap_next(), which maps a file offset to a window offset. */ static long virtio_fs_direct_access(struct dax_device *dax_dev, pgoff_t pgoff, long nr_pages, enum dax_access_mode mode, -- 2.52.0