From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (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 5F5014DA526 for ; Wed, 29 Jul 2026 19:30:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785353430; cv=none; b=SmcGzHjfvO6ct55Za54w+DrU4JdT2AG0sIuF45EgBicf7mitKbF+ax8Y+eebeuiIUvJYn6oDkDiJzmdoe6jBIHPe7fUYYJ3KqOOvhwILg7QwKMWTc+DVmvFD9+i+s2wPBndgOI+JUpKgcyLFub/uDn9CVEGVuVsRcryTBCt7eCs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785353430; c=relaxed/simple; bh=rUAOU3IydJmQYweh2Ff4mzFaQjYgFYXBQUGY5Kg74Z8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lBgoAYHIJ/qNWDmkRK8VTjxvvaNhkkjO5zNuQmT1PHr8u+OzpgWxS1tNdoVQZyDRRxfgfJoReUx2wlnO/qt0Ln+QAqh1oVcaMA8vKxAW9cnxJeGWkxROBIhT63Kq0BQLYHpcsNavEwKMf2Eu4YOZCzGzm1keZ2nUEPn2r+xaPBg= 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=A43P+/w2; arc=none smtp.client-ip=209.85.216.47 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="A43P+/w2" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-382ef647e20so1373465a91.1 for ; Wed, 29 Jul 2026 12:30:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785353415; x=1785958215; 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=4S5rDCc1of8MfqKGvH0/SP90Wdz9xuZW0t7RbrAbJlA=; b=A43P+/w2rt3EdLoTBu9r0U6/ZtYtTM0jFo5JmtuE0Na/3Fc2SKxX11R3fEGqlL4AD0 +p3Q4/5VVPZ3PLhubEb8Vn9rwQIHQM+heceypLlnJQwgI4H6s46cir3R3rc8MFRFG+RV bl8IbIi3lc5xIg3Xv5t3Ve4szR+WAiCmJFjAiLvp9hHVzE8gkly320J+1oJzqstFvMQu zMwIq0SRyal4cYSCvTStTiLn0cmUV4jenHNoi7ne0V4wl/85xIDTWv32Eb1E3IRevvns FlxIE6cBIRdDfBAmuz547HPcZNtIIGIWmIpkWK+7ePILDj1SotKCb+q8YPUQSSsqdKN3 fGAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785353415; x=1785958215; 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=4S5rDCc1of8MfqKGvH0/SP90Wdz9xuZW0t7RbrAbJlA=; b=pxmukBp34WJPmP96I8EfdnnUC4lfm2ZIflw2z2n5hNMHx/fA9Wie71v/mLvwpHiYVp +h8/0WocgSnBn+pCzUP7hucxwpf30lbmlwGJUBRQgHoy6QQ198vq7IysVwt70Jqfwga/ GN9TDnaaLYkmBlWge1K2ou6T0GxRdEBZd+kZ9dr5dRGIWvDE1Yq/V85sGOWJPWB8IOuz 3Ma9PX8AgV03wH2R988gfqOWgcIDPYbyHD2gxlNe6JeM43quV4TFEH5CDkWgG95TI8bz gXEH3drmQVnCKFk/Ei8C9OtYA2IPCK+Ifnd1YITKyC5aAmbyXGAsLBetLlj8kgQeHAp4 Bf1A== X-Forwarded-Encrypted: i=1; AHgh+RrcnHz56NEnoDuRKZXIlteR+ZQ0eFfh35GFUrSdMHQVeawMuv/cGPkor8QGgiODhjKxBMeBGmu7OGap@vger.kernel.org X-Gm-Message-State: AOJu0YxdM7rcp52kB+bS0WcDA0Xv9InZlR4Hqajg3VydLzRkOxoZQCq2 rj9QffTD0tpZTQNncStU0koHTjA1XV4kjeQgjya8SR22vmxXYtAXGE5S X-Gm-Gg: AR+sD12KCxwh+WaN5vJQ94Bx5jANZ6N4PMFm8zRGTD9oQB0ofO4Kgi51uNyvSSzjdrv CIeQ2BGrne0FEOWJ3x6JCHGdcr8bxD2DvO/DpOuZKvkHkPFc6x1Kc8igYpCJMGmp6PtMMdfahDh o1g/32oqjzss8vPSkewmoiXh3UWKtVEH5tVzKdF6WedhYOCm03zpnfIN+xWYldykagdCl64cTpT aznq7UusSSOkcifXRJuYaQzYEcu8F/gteaL+VZcfgaACSnhA0QjYMs8nGGwFmboZgtdkm4qqTif RMCCEHwv8WWrFt10SXv6CoydShDCKb6wxIoY2vUziGUOknqiXN4OwQM3g/FU8Nn+1+5CwCBeWat Na/AeMix1w+YY7HlMx26EfdK/1WR1bRYyOLj0ExeKfPZXMrwCdpSauzkQlm4/d6zkZFBg90L/cI yho/VCSoeEhY9idgMO2XRjkQ8ce7RhI4ahW6/2IVLELnxOqw74MmVt4+a+k2NbvwwQUimwCxCU8 85sCvbIK+xyfS7CeeTvwyMk/MFDpQ72qYiwFmB7+pcB4Go= X-Received: by 2002:a17:90b:5484:b0:38d:a150:ee04 with SMTP id 98e67ed59e1d1-38f99384981mr149187a91.30.1785353415396; Wed, 29 Jul 2026 12:30:15 -0700 (PDT) Received: from localhost ([2a03:2880:ff::]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f6411189bsm3156540a91.3.2026.07.29.12.30.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jul 2026 12:30:14 -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 , Theodore Ts'o , Jaegeuk Kim , Miklos Szeredi , Andreas Gruenbacher , Mikulas Patocka , Hyunchul Lee , Konstantin Komarov , Carlos Maiolino , Damien Le Moal , libaokun@linux.alibaba.com, bfoster@redhat.com, linux-ext4@vger.kernel.org, linux-xfs@vger.kernel.org, Gao Xiang Subject: [PATCH v5 11/22] erofs: convert iomap ops to ->iomap_next() Date: Wed, 29 Jul 2026 12:27:26 -0700 Message-ID: <20260729192737.3190206-12-joannelkoong@gmail.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260729192737.3190206-1-joannelkoong@gmail.com> References: <20260729192737.3190206-1-joannelkoong@gmail.com> Precedence: bulk X-Mailing-List: linux-ext4@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. Each callback is generated with the DEFINE_IOMAP_ITER_NEXT() and 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. Reviewed-by: Gao Xiang Signed-off-by: Joanne Koong --- fs/erofs/data.c | 6 ++++-- fs/erofs/zmap.c | 5 ++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/fs/erofs/data.c b/fs/erofs/data.c index 9aa48c8d67d1..d2f01245ee79 100644 --- a/fs/erofs/data.c +++ b/fs/erofs/data.c @@ -380,9 +380,11 @@ static int erofs_iomap_end(struct inode *inode, loff_t pos, loff_t length, return written; } +static DEFINE_IOMAP_ITER_NEXT_END(erofs_iomap_next, 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..3966b62a7051 100644 --- a/fs/erofs/zmap.c +++ b/fs/erofs/zmap.c @@ -821,6 +821,9 @@ static int z_erofs_iomap_begin_report(struct inode *inode, loff_t offset, return 0; } +static DEFINE_IOMAP_ITER_NEXT(z_erofs_iomap_next_report, + z_erofs_iomap_begin_report); + 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