From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ot1-f45.google.com (mail-ot1-f45.google.com [209.85.210.45]) (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 246161D5CFE for ; Wed, 1 Jul 2026 00:11:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782864700; cv=none; b=cOo2bqZekYINE5MTfcJ7zPwxhX8Ukci2ZgJZnddKcdS+9/0HDfhVG0jbvHFRWCNOgz8D74QeYOf2yRjKcdGPTe3Wo5qiLHmNQhnL6End50bqxrW0uldMHP6ErTAmf2QvRXODwqE3gSjOii3R82oABy6SXgihiIKZtOcWI4fX+Rg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782864700; c=relaxed/simple; bh=UAK5oUiWMIcbyMwKSX2yaW8g3zJEjKE8bwxijrAtnjA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hCNPV32l/QcC7HJ4rci9cQ2jgugVx3QuA1lrOJJdzPsFGAxnn2hc2kXyklNdW0twFkzdHeXgIUSe0HPwKz2fuN0E8+e+lyV7xGUX86Nqn4woG62Sd9C3T3y8hZG0AlrNYjQmQj2gvzYluiebIMf6UbrGjxRd6X3PY1VpmwzZSIk= 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=SgtrOeVB; arc=none smtp.client-ip=209.85.210.45 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="SgtrOeVB" Received: by mail-ot1-f45.google.com with SMTP id 46e09a7af769-7e9c7174e98so46772a34.2 for ; Tue, 30 Jun 2026 17:11:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1782864698; x=1783469498; 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; bh=N7+CcIiDetDTiagtbVpMn37s8DwFl6V2j0Jf9vPEZaw=; b=SgtrOeVBMyf8aTBkOw+Yu0WBLRlfFqsf+8Niaoab/o6tzS59mJ/XK1imUjCuethZGN fQVpqpo+K0M+WRfC6hMRjcO7Ii4hAPAMpMSAWlcz7yzxXOeq3j/0TWh0YvtulVuc/kVU sLupNzQ+wnCYejMH23zsmihA8bzmQTYA50BA5fDS8QCLt+74Ngrci3zsSAGJmjKbxntA enRXaDLwKDwn4HMz3kQSq08qcyunZHoUOdFRlxWe+r1QSHidSzMPL9/uQdG9QwDY2ruE XuiW2+nZL3gOQ9CVZGS3l7oi55Fqf6ndE9uBizP0vvMr7Hd3DH4eE8emTchIA8lw0WIj 5bng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782864698; x=1783469498; 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; bh=N7+CcIiDetDTiagtbVpMn37s8DwFl6V2j0Jf9vPEZaw=; b=fBP0NgANBY7/jn4bwEluLiaUJ8e7mKd+4XYdeGkfgdZu2ZSmnCOk3CkWDnjOrg8v3m CThvmSnSi3yFZ3xn0SYtyML0yybgcekHlQafyMpdeGLX2Aj5QvKcLWATJjSpYSpF+YAM atpGuX4uPfZETBzR44XHBByTBaAPDlX4VZI8hrRWPaFwVLVcMZJxkRf1swD2rsXMmaHk amHDb+sDU84s4df0eq4pm7mMyL0bM9WihQ37tqrbaBa3Fkwy+rA+qT37bZ39Q6+5f8/Z 1PwmSTMMuBNX98QX7JhD0rcILwvlUNRGy5AmXXoL2NUmEXjjMJo6rk6NK7EYH5UEs14i gUnQ== X-Forwarded-Encrypted: i=1; AFNElJ/Rh+P4S8PIuNIhkylvh1czbGua5iQLDxEE/QmcrsgyBXK51Ce5tudSkA8z8IsfyT+SdOkirAl14bTIk2M=@vger.kernel.org X-Gm-Message-State: AOJu0YyuB4VWP/HRjXl9WxBpfiYqrGhQopHuBXiTHqyIPT7ZJVNyjSbE K2ujswT8akt9tN4+l+RDNwMqNI9tJ8JhvXHQ6Oe/kQf+KWkn4JdVXfef X-Gm-Gg: AfdE7cmwqDAyRQCHXjZ23ZmONize49NSvNOrnb3pdz/bgPGavnJEHu7PIE+Lc/wnxQy w2TtVyWaTIRAYBrOBZ5M0EcpRqeqwHThVn7F72EHzs6lqS/SiR+cl+gS7ZQIn0eUcyrCehs9MrZ vmUJ01lH4P70jJeGJDmBcqVYQENQ6dzJ+t5gqI3dw31dbk+eVMNXzByrfsmeAUYV0Df25lJmWBT 5zb9vF1d3UerDgg+ocBUaE5yKAAM/4wr2rY5r2gCQe35VQTqKOv/gfcnKzIPCkpU9nlRvaEaeSm 05LonUvyOdx61FoIDoijwdrpnJIRyKtiPawyywQfalHZe0IrdoeWIhV8ZHx9A7oW9WTdfAukn5l sIUYs2UeUQ2iMA45H4PiYc4pPkQ46XrvHWWJlZ9dcECVKYa7yqrXvyBjbDOVjcx96LrUb2pca5q MqBeEauQoho8Lqz2fX/rUIj9ORmNQsDL3As07h7u73kX0jvBgVOrkN0bqs6vpqV5r9 X-Received: by 2002:a05:6830:3808:b0:7dc:cdea:7d9 with SMTP id 46e09a7af769-7e9fc15ad0cmr1772936a34.22.1782864698251; Tue, 30 Jun 2026 17:11:38 -0700 (PDT) Received: from localhost ([2a03:2880:ff:4e::]) by smtp.gmail.com with ESMTPSA id 46e09a7af769-7e9ec2b96c0sm3558136a34.14.2026.06.30.17.11.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jun 2026 17:11:37 -0700 (PDT) From: Joanne Koong To: brauner@kernel.org, hch@lst.de Cc: djwong@kernel.org, willy@infradead.org, hsiangkao@linux.alibaba.com, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, Gao Xiang , Chao Yu , Yue Hu , Jeffle Xu , Sandeep Dhavale , Hongbo Li , Chunhai Guo , linux-erofs@lists.ozlabs.org (open list:EROFS FILE SYSTEM), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 07/18] erofs: convert iomap ops to ->iomap_next() Date: Tue, 30 Jun 2026 17:09:22 -0700 Message-ID: <20260701000949.1666714-8-joannelkoong@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260701000949.1666714-1-joannelkoong@gmail.com> References: <20260701000949.1666714-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Convert erofs iomap_ops to the new ->iomap_next() callback. This uses the iomap_process() helper, which finishes the previous mapping if needed and produces the next one. No functional changes are intended. Signed-off-by: Joanne Koong --- fs/erofs/data.c | 10 ++++++++-- fs/erofs/zmap.c | 9 ++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 9aa48c8d67d1..47dba61ec576 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -380,9 +380,15 @@ static int erofs_iomap_end(struct inode *inode, loff_t pos, loff_t length, return written; } +static int erofs_iomap_next(const struct iomap_iter *iter, struct iomap *iomap, + struct iomap *srcmap) +{ + return iomap_process(iter, iomap, srcmap, erofs_iomap_begin, + erofs_iomap_end); +} + static const struct iomap_ops erofs_iomap_ops = { - .iomap_begin = erofs_iomap_begin, - .iomap_end = erofs_iomap_end, + .iomap_next = erofs_iomap_next, }; int erofs_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, diff --git a/fs/erofs/zmap.c b/fs/erofs/zmap.c index bab521613552..dd058413a0b6 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -821,6 +821,13 @@ static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset, return 0; } +static int z_erofs_iomap_next_report(const struct iomap_iter *iter, + struct iomap *iomap, struct iomap *srcmap) +{ + return iomap_process(iter, iomap, srcmap, z_erofs_iomap_begin_report, + NULL); +} + const struct iomap_ops z_erofs_iomap_report_ops = { - .iomap_begin = z_erofs_iomap_begin_report, + .iomap_next = z_erofs_iomap_next_report, }; -- 2.52.0