Commit bb6b1805 authored by Zhang Yi's avatar Zhang Yi Committed by Theodore Ts'o

ext4: drop iblock parameter

The start block of the delalloc extent to be inserted is equal to
map->m_lblk, just drop the duplicate iblock input parameter.
Signed-off-by: default avatarZhang Yi <yi.zhang@huawei.com>
Reviewed-by: default avatarJan Kara <jack@suse.cz>
Reviewed-by: default avatarRitesh Harjani (IBM) <ritesh.list@gmail.com>
Link: https://patch.msgid.link/20240517124005.347221-6-yi.zhang@huaweicloud.comSigned-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
parent 14a210c1
...@@ -1712,8 +1712,7 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk) ...@@ -1712,8 +1712,7 @@ static int ext4_insert_delayed_block(struct inode *inode, ext4_lblk_t lblk)
* time. This function looks up the requested blocks and sets the * time. This function looks up the requested blocks and sets the
* buffer delay bit under the protection of i_data_sem. * buffer delay bit under the protection of i_data_sem.
*/ */
static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, static int ext4_da_map_blocks(struct inode *inode, struct ext4_map_blocks *map,
struct ext4_map_blocks *map,
struct buffer_head *bh) struct buffer_head *bh)
{ {
struct extent_status es; struct extent_status es;
...@@ -1733,8 +1732,8 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, ...@@ -1733,8 +1732,8 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
(unsigned long) map->m_lblk); (unsigned long) map->m_lblk);
/* Lookup extent status tree firstly */ /* Lookup extent status tree firstly */
if (ext4_es_lookup_extent(inode, iblock, NULL, &es)) { if (ext4_es_lookup_extent(inode, map->m_lblk, NULL, &es)) {
retval = es.es_len - (iblock - es.es_lblk); retval = es.es_len - (map->m_lblk - es.es_lblk);
if (retval > map->m_len) if (retval > map->m_len)
retval = map->m_len; retval = map->m_len;
map->m_len = retval; map->m_len = retval;
...@@ -1754,7 +1753,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, ...@@ -1754,7 +1753,7 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
return 0; return 0;
} }
map->m_pblk = ext4_es_pblock(&es) + iblock - es.es_lblk; map->m_pblk = ext4_es_pblock(&es) + map->m_lblk - es.es_lblk;
if (ext4_es_is_written(&es)) if (ext4_es_is_written(&es))
map->m_flags |= EXT4_MAP_MAPPED; map->m_flags |= EXT4_MAP_MAPPED;
else if (ext4_es_is_unwritten(&es)) else if (ext4_es_is_unwritten(&es))
...@@ -1790,8 +1789,8 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock, ...@@ -1790,8 +1789,8 @@ static int ext4_da_map_blocks(struct inode *inode, sector_t iblock,
* is held in write mode, before inserting a new da entry in * is held in write mode, before inserting a new da entry in
* the extent status tree. * the extent status tree.
*/ */
if (ext4_es_lookup_extent(inode, iblock, NULL, &es)) { if (ext4_es_lookup_extent(inode, map->m_lblk, NULL, &es)) {
retval = es.es_len - (iblock - es.es_lblk); retval = es.es_len - (map->m_lblk - es.es_lblk);
if (retval > map->m_len) if (retval > map->m_len)
retval = map->m_len; retval = map->m_len;
map->m_len = retval; map->m_len = retval;
...@@ -1848,7 +1847,7 @@ int ext4_da_get_block_prep(struct inode *inode, sector_t iblock, ...@@ -1848,7 +1847,7 @@ int ext4_da_get_block_prep(struct inode *inode, sector_t iblock,
* preallocated blocks are unmapped but should treated * preallocated blocks are unmapped but should treated
* the same as allocated blocks. * the same as allocated blocks.
*/ */
ret = ext4_da_map_blocks(inode, iblock, &map, bh); ret = ext4_da_map_blocks(inode, &map, bh);
if (ret <= 0) if (ret <= 0)
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment