summaryrefslogtreecommitdiffstats
path: root/fs/ext4
diff options
context:
space:
mode:
authorEric Whitney <enwlinux@gmail.com>2014-03-13 23:14:46 -0400
committerTheodore Ts'o <tytso@mit.edu>2014-03-13 23:14:46 -0400
commit31cf0f2c3195258f83adabf1a71a782a92b8268a (patch)
tree0f21d7c7b88860776cfbec90cd30591c2cb50a7f /fs/ext4
parent38c03b34391dd25a39576073e58485e5949d29fe (diff)
downloadblackbird-op-linux-31cf0f2c3195258f83adabf1a71a782a92b8268a.tar.gz
blackbird-op-linux-31cf0f2c3195258f83adabf1a71a782a92b8268a.zip
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>
Diffstat (limited to 'fs/ext4')
-rw-r--r--fs/ext4/extents.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c
index bbba1ef5417d..17b2fb2e8d19 100644
--- 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);
OpenPOWER on IntegriCloud