1 ext4: drop EXT4_EX_NOFREE_ON_ERR in convert_initialized_extent()
3 Transfer responsibility of freeing struct ext4_ext_path on error to
4 ext4_ext_find_extent().
6 Signed-off-by: Theodore Ts'o <tytso@mit.edu>
8 fs/ext4/extents.c | 10 +++++-----
9 1 file changed, 5 insertions(+), 5 deletions(-)
11 diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
12 index 985848d..ceab095 100644
13 --- a/fs/ext4/extents.c
14 +++ b/fs/ext4/extents.c
15 @@ -3921,9 +3921,10 @@ get_reserved_cluster_alloc(struct inode *inode, ext4_lblk_t lblk_start,
17 convert_initialized_extent(handle_t *handle, struct inode *inode,
18 struct ext4_map_blocks *map,
19 - struct ext4_ext_path *path, int flags,
20 + struct ext4_ext_path **ppath, int flags,
21 unsigned int allocated, ext4_fsblk_t newblock)
23 + struct ext4_ext_path *path = *ppath;
24 struct ext4_extent *ex;
27 @@ -3952,8 +3953,7 @@ convert_initialized_extent(handle_t *handle, struct inode *inode,
30 ext4_ext_drop_refs(path);
31 - path = ext4_ext_find_extent(inode, map->m_lblk, &path,
32 - EXT4_EX_NOFREE_ON_ERR);
33 + path = ext4_ext_find_extent(inode, map->m_lblk, ppath, 0);
36 depth = ext_depth(inode);
37 @@ -4331,8 +4331,8 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
38 if ((!ext4_ext_is_unwritten(ex)) &&
39 (flags & EXT4_GET_BLOCKS_CONVERT_UNWRITTEN)) {
40 allocated = convert_initialized_extent(
41 - handle, inode, map, path, flags,
42 - allocated, newblock);
43 + handle, inode, map, &path,
44 + flags, allocated, newblock);
46 } else if (!ext4_ext_is_unwritten(ex))