From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 72D7642E8C1 for ; Mon, 27 Jul 2026 21:24:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785187487; cv=none; b=tFXSKtp2mfIZEFsniJhH9zYoVRXXE0ZocCPpXNaVXA+2fPaAu+ocrjK5huW/H/VWfLVbwP8plv4CSYzZ2UX09z3WuEFxzmRArMdremo0l5Qp67BSTT+FUc/LMUwBDUIgk4pG/yBkHjvaB3nT3jmpkvNPsYW+9In0H1Ai8aEayuA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785187487; c=relaxed/simple; bh=1LODBsXTJz074zPmHlKPolHt/XzrgN7p/Zc0cYoesy0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oreMA0CGvCcUznvq29IKCkQTGyy+OWaOplYBKBnqbO4sIpWE0mDKeJmgsmnLE7LN/x8v9N0qk3y0LPjCYBfVuVbfhoByVbee9R5X2hHpZNdAvOeYDcjTq3qsQKg8jDI+iGunTc70IgNtAR7wHRKAQ5DavHGwoOh/e+UtbSwlsL0= 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=eAbLykFf; arc=none smtp.client-ip=209.85.210.176 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="eAbLykFf" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-845c92bc464so2642662b3a.2 for ; Mon, 27 Jul 2026 14:24:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785187486; x=1785792286; 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=+Cj5pCwh9UiKuAyGTCN2ecA2rWhLN61eKI8rtelBEo0=; b=eAbLykFf/DczSvuITBALQTFGTaG9iu6EdNWGPfmziuDcvY2Vx814nnsKLXupim4pm+ irlsgwtVUUsWoom7k/FNyTT7d5lZ0cKFr6amwnUBryAZ0eWV9V7KNGNDry7Y7P1cqdzg Fz1KSyf40Jfa1zKFLCwzNR5WfuM4k7eDCt8MzOx34pJyAtlkn4pAKNe0VdAnYBMKu6n2 cU9On7awWeoqYQBWPWQfRS+bxy6Qkh1pbnM7Bc9qIYuisxF4E2RYeMa1+P5VCMje6t/o SaDK+QsUqi9y4vCsE/hSEhl2A6aTCNwSvZUEA1X8eMFi7xb+36YxDy9QqXAhJsu3tQui qamQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785187486; x=1785792286; 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=+Cj5pCwh9UiKuAyGTCN2ecA2rWhLN61eKI8rtelBEo0=; b=oRJA0o7uPAitqjiJeepW8r7ZJPEoetsofCRziHwzEfpSEj9uGwIwqIm96YS+ithY6k CPdfpAzuUhfbEUzT9L0BsReGakGTMcxi6gX9wbL2UhhHbEPskCEFK6r70Y5ct7vt6BcP Wd+Bk3DwIzN75lS5DuQJnhtJgJYoHpKMJvQ1TaP8c2jcfYGxg6J1GGBHF3wDzAq7J/ky HP8YCJuGUnB1/V39ktPVI3dtr2Yr8Y8dyAo6eO3g1rOJnj5eOQmdorO8zgaaGQkNjp7k U1Tf6DXKyXkRCDZ00jK0bcMgzjUX39gjLNxKseD9W/AZIusRKJJVNfFDtqSTvMcEBl9J LPXg== X-Forwarded-Encrypted: i=1; AHgh+Rr0kwuJUfYzaDG7J+vY5MMp4EcOJs2xEBM4ZO/+AO6W1VszRNSDMpua0TUKzN6co+F/b0BGFC1rGx0=@vger.kernel.org X-Gm-Message-State: AOJu0Yw6byzDXVRW2gZJefoigicwNChlejlZkyU1hm4knUPr0mkt/xTf kO9pvjJO1quSNUxczd+uBzmoUJ4XbMAOCXfR+G/PlJ0MKCcAaDw9PUtp X-Gm-Gg: AR+sD12KXjwzeDc2aJz15RqWAP8mtMsMd8Ft5nuOWDjaoZT9isYoZVgP+ZYV29OU8zx Qu3uLTykY03AV64sPCrwbGJhpFSWJOjgTW6j/QHxM2JXrGF8MCqD7du3wQuIvnY7oI3nZm9zmwt OsufC2z0EhzsRoKHgYfEfqTA2XXHDBZHlm9Yz1zrUbPehuhZZY2EXjaR9fR/Lk5DZSUGrVAIXUv VhluFBvBSbALOQGHyqXlSj+xS9rNekqlQB6ZlSs3vDE4hsTGSpSWmA+8fIsSCgdzp4egfH7/ThX tyY19evNQBL+if7hL1GT1sVvs9ldM3mbJITblM6ITqvgygA13TFcci78PHtsOjop2nIm++ZwmNK BoQgnJegOGvDdnWxLDOmL0WukUUnyh07y/+24+880aNqwCXMHGM4gObh6T2qVrEbbygwRelVY9E 83uhKcyB6zk7tTjFz6bpVs7X0zNTf/TlhwadzcGzsqYLOUMdGw0hOhCA== X-Received: by 2002:a05:6a00:1790:b0:84e:831:9a1a with SMTP id d2e1a72fcca58-84e594683e4mr8243554b3a.21.1785187485740; Mon, 27 Jul 2026 14:24:45 -0700 (PDT) Received: from localhost ([2a03:2880:ff:50::]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84e53425989sm3543194b3a.48.2026.07.27.14.24.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 27 Jul 2026 14:24:44 -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 09/21] ext4: convert iomap ops to ->iomap_next() Date: Mon, 27 Jul 2026 14:17:46 -0700 Message-ID: <20260727211758.1116539-10-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 ext4 iomap_ops to the new ->iomap_next() callback. Each callback is generated with the DEFINE_IOMAP_ITER_NEXT() macro, which wraps the iomap_iter_next() helper to finish the previous mapping if needed and produce the next one. No functional changes are intended. Reviewed-by: Jan Kara Reviewed-by: Baokun Li Signed-off-by: Joanne Koong --- fs/ext4/extents.c | 4 +++- fs/ext4/inode.c | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 91c97af64b31..15972410d460 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -5171,8 +5171,10 @@ static int ext4_iomap_xattr_begin(struct inode *inode, loff_t offset, return error; } +static DEFINE_IOMAP_ITER_NEXT(ext4_iomap_xattr_next, ext4_iomap_xattr_begin); + static const struct iomap_ops ext4_iomap_xattr_ops = { - .iomap_begin = ext4_iomap_xattr_begin, + .iomap_next = ext4_iomap_xattr_next, }; static int ext4_fiemap_check_ranges(struct inode *inode, u64 start, u64 *len) diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index b48c54f3312b..bf9755b541be 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3850,8 +3850,10 @@ int ext4_iomap_begin(struct inode *inode, loff_t offset, loff_t length, return 0; } +static DEFINE_IOMAP_ITER_NEXT(ext4_iomap_next, ext4_iomap_begin); + const struct iomap_ops ext4_iomap_ops = { - .iomap_begin = ext4_iomap_begin, + .iomap_next = ext4_iomap_next, }; static int ext4_iomap_begin_report(struct inode *inode, loff_t offset, @@ -3905,8 +3907,10 @@ static int ext4_iomap_begin_report(struct inode *inode, loff_t offset, return 0; } +static DEFINE_IOMAP_ITER_NEXT(ext4_iomap_next_report, ext4_iomap_begin_report); + const struct iomap_ops ext4_iomap_report_ops = { - .iomap_begin = ext4_iomap_begin_report, + .iomap_next = ext4_iomap_next_report, }; /* -- 2.52.0