]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ext4: rename ext4_block_zero_page_range() to ext4_block_zero_range()
authorZhang Yi <yi.zhang@huawei.com>
Fri, 27 Mar 2026 10:29:30 +0000 (18:29 +0800)
committerTheodore Ts'o <tytso@mit.edu>
Fri, 10 Apr 2026 01:57:51 +0000 (21:57 -0400)
Rename ext4_block_zero_page_range() to ext4_block_zero_range() since the
"page" naming is no longer appropriate for current context. Also change
its signature to take an inode pointer instead of an address_space. This
aligns with the caller ext4_block_zero_eof() and
ext4_zero_partial_blocks().

Signed-off-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20260327102939.1095257-5-yi.zhang@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
fs/ext4/inode.c

index 3d4650cfc3e0dc1438cbef16e65a0dd9b4a539e4..0e39c65880aa1d7a695639fe89725153be32ea1d 100644 (file)
@@ -4170,17 +4170,14 @@ out:
 }
 
 /*
- * ext4_block_zero_page_range() zeros out a mapping of length 'length'
- * starting from file offset 'from'.  The range to be zero'd must
- * be contained with in one block.  If the specified range exceeds
- * the end of the block it will be shortened to end of the block
- * that corresponds to 'from'
+ * Zeros out a mapping of length 'length' starting from file offset
+ * 'from'.  The range to be zero'd must be contained with in one block.
+ * If the specified range exceeds the end of the block it will be
+ * shortened to end of the block that corresponds to 'from'.
  */
-static int ext4_block_zero_page_range(handle_t *handle,
-               struct address_space *mapping, loff_t from, loff_t length,
-               bool *did_zero)
+static int ext4_block_zero_range(handle_t *handle, struct inode *inode,
+                                loff_t from, loff_t length, bool *did_zero)
 {
-       struct inode *inode = mapping->host;
        unsigned blocksize = inode->i_sb->s_blocksize;
        unsigned int max = blocksize - (from & (blocksize - 1));
 
@@ -4225,15 +4222,13 @@ int ext4_block_zero_eof(handle_t *handle, struct inode *inode,
        if (length > blocksize - offset)
                length = blocksize - offset;
 
-       return ext4_block_zero_page_range(handle, inode->i_mapping, from,
-                                         length, NULL);
+       return ext4_block_zero_range(handle, inode, from, length, NULL);
 }
 
 int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
                             loff_t lstart, loff_t length)
 {
        struct super_block *sb = inode->i_sb;
-       struct address_space *mapping = inode->i_mapping;
        unsigned partial_start, partial_end;
        ext4_fsblk_t start, end;
        loff_t byte_end = (lstart + length - 1);
@@ -4248,22 +4243,22 @@ int ext4_zero_partial_blocks(handle_t *handle, struct inode *inode,
        /* Handle partial zero within the single block */
        if (start == end &&
            (partial_start || (partial_end != sb->s_blocksize - 1))) {
-               err = ext4_block_zero_page_range(handle, mapping,
-                                                lstart, length, NULL);
+               err = ext4_block_zero_range(handle, inode, lstart,
+                                           length, NULL);
                return err;
        }
        /* Handle partial zero out on the start of the range */
        if (partial_start) {
-               err = ext4_block_zero_page_range(handle, mapping, lstart,
-                                                sb->s_blocksize, NULL);
+               err = ext4_block_zero_range(handle, inode, lstart,
+                                           sb->s_blocksize, NULL);
                if (err)
                        return err;
        }
        /* Handle partial zero out on the end of the range */
        if (partial_end != sb->s_blocksize - 1)
-               err = ext4_block_zero_page_range(handle, mapping,
-                                                byte_end - partial_end,
-                                                partial_end + 1, NULL);
+               err = ext4_block_zero_range(handle, inode,
+                                           byte_end - partial_end,
+                                           partial_end + 1, NULL);
        return err;
 }