| Message ID | 20140226203914.GA2153@wallace |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wed, Feb 26, 2014 at 03:39:14PM -0500, Eric Whitney wrote: > Code deallocating the extent path referenced by an argument to > ext4_ext_handle_uninitialized_extents was made redundant with identical > code in its one caller, ext4_ext_map_blocks, by commit 3779473246. > Allocating and deallocating the path in the same function also makes > the code clearer. > > Signed-off-by: Eric Whitney <enwlinux@gmail.com> Thanks, applied. - Ted -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index ef4b535..cca976b 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4006,10 +4006,6 @@ out1: map->m_pblk = newblock; map->m_len = allocated; out2: - if (path) { - ext4_ext_drop_refs(path); - kfree(path); - } return err ? err : allocated; } @@ -4209,7 +4205,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode, err = ret; else allocated = ret; - goto out3; + goto out2; } } @@ -4490,7 +4486,6 @@ out2: kfree(path); } -out3: trace_ext4_ext_map_blocks_exit(inode, flags, map, err ? err : allocated); ext4_es_lru_add(inode);
Code deallocating the extent path referenced by an argument to ext4_ext_handle_uninitialized_extents was made redundant with identical code in its one caller, ext4_ext_map_blocks, by commit 3779473246. Allocating and deallocating the path in the same function also makes the code clearer. Signed-off-by: Eric Whitney <enwlinux@gmail.com> --- fs/ext4/extents.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)