ext4: delete path dealloc code in ext4_ext_handle_uninitialized_extents

Eric Whitney · tytso · commit 31cf0f2c3195 · 2014-03-13T23:14:46.000-04:00
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 3779473. 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
@@ -4005,10 +4005,6 @@ ext4_ext_handle_uninitialized_extents(handle_t *handle, struct inode *inode,
 	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 @@ int ext4_ext_map_blocks(handle_t *handle, struct inode *inode,
 		kfree(path);
 	}
 
-out3:
 	trace_ext4_ext_map_blocks_exit(inode, flags, map,
 				       err ? err : allocated);
 	ext4_es_lru_add(inode);

Original file line number	Diff line number	Diff line change
`@@ -4005,10 +4005,6 @@ ext4_ext_handle_uninitialized_extents(handle_t handle, struct inode inode,`
`4005`	`4005`	`map->m_pblk = newblock;`
`4006`	`4006`	`map->m_len = allocated;`
`4007`	`4007`	`out2:`
`4008`		`- if (path) {`
`4009`		`- ext4_ext_drop_refs(path);`
`4010`		`- kfree(path);`
`4011`		`- }`
`4012`	`4008`	`return err ? err : allocated;`
`4013`	`4009`	`}`
`4014`	`4010`
`@@ -4208,7 +4204,7 @@ int ext4_ext_map_blocks(handle_t handle, struct inode inode,`
`4208`	`4204`	`err = ret;`
`4209`	`4205`	`else`
`4210`	`4206`	`allocated = ret;`
`4211`		`- goto out3;`
	`4207`	`+ goto out2;`
`4212`	`4208`	`}`
`4213`	`4209`	`}`
`4214`	`4210`
`@@ -4489,7 +4485,6 @@ int ext4_ext_map_blocks(handle_t handle, struct inode inode,`
`4489`	`4485`	`kfree(path);`
`4490`	`4486`	`}`
`4491`	`4487`
`4492`		`-out3:`
`4493`	`4488`	`trace_ext4_ext_map_blocks_exit(inode, flags, map,`
`4494`	`4489`	`err ? err : allocated);`
`4495`	`4490`	`ext4_es_lru_add(inode);`