@@ -4363,7 +4363,7 @@ static int ext4_ext_fiemap_cb(struct inode *inode, ext4_lblk_t next,
struct ext4_ext_cache *newex, struct ext4_extent *ex,
void *data)
{
- struct delayed_extent de;
+ struct status_extent se;
__u64 logical;
__u64 physical;
__u64 length;
@@ -4373,9 +4373,9 @@ static int ext4_ext_fiemap_cb(struct inode *inode, ext4_lblk_t next,
struct fiemap_extent_info *fieinfo = data;
unsigned char blksize_bits;
- de.start = newex->ec_block;
+ se.start = newex->ec_block;
down_read(&EXT4_I(inode)->i_data_sem);
- next_del = ext4_de_find_extent(inode, &de);
+ next_del = ext4_se_find_extent(inode, &se);
up_read(&EXT4_I(inode)->i_data_sem);
next = min(next_del, next);
@@ -4384,19 +4384,19 @@ static int ext4_ext_fiemap_cb(struct inode *inode, ext4_lblk_t next,
* No extent in extent-tree contains block @newex->ec_start,
* then the block may stay in 1)a hole or 2)delayed-extent.
*/
- if (de.len == 0)
+ if (se.len == 0)
/* A hole found. */
return EXT_CONTINUE;
- if (de.start > newex->ec_block) {
+ if (se.start > newex->ec_block) {
/* A hole found. */
- newex->ec_len = min(de.start - newex->ec_block,
+ newex->ec_len = min(se.start - newex->ec_block,
newex->ec_len);
return EXT_CONTINUE;
}
flags |= FIEMAP_EXTENT_DELALLOC;
- newex->ec_len = de.start + de.len - newex->ec_block;
+ newex->ec_len = se.start + se.len - newex->ec_block;
}
if (ex && ext4_ext_is_uninitialized(ex))
This patch renames changes introduced by patch "[PATCH_V3_5_6\]_ext4_reimplement_fiemap_on_delayed_extent_tree" All code referencing "delayed extents" or "de" are changed to "status extents" or "se" Signed-off-by: Allison Henderson <achender@linux.vnet.ibm.com> --- :100644 100644 a8b382e... 3f76625... M fs/ext4/extents.c fs/ext4/extents.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-)