ext4: delete path dealloc code in ext4_ext_handle_uninitialized_extents

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>
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>

diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index bbba1ef5417d5204bfa1bab4a9dea1cbfddbe5d2..17b2fb2e8d195fc355a44096ca4c1ba07ec721db 100644 (file)
--- a/fs/ext4/extents.c
+++ b/fs/ext4/extents.c
@@ -4005,10 +4005,6 @@ out1:
        map->m_pblk = newblock;
        map->m_len = allocated;
 out2:
-       if (path) {
-               ext4_ext_drop_refs(path);
-               kfree(path);
-       }
        return err ? err : allocated;
 }
 
@@ -4208,7 +4204,7 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
                                err = ret;
                        else
                                allocated = ret;
-                       goto out3;
+                       goto out2;
                }
        }
 
@@ -4489,7 +4485,6 @@ out2:
                kfree(path);
        }
 
-out3:
        trace_ext4_ext_map_blocks_exit(inode, flags, map,
                                       err ? err : allocated);
        ext4_es_lru_add(inode);