ext4: extents: Remove unnecessary ‘NULL’ values from ablocks
PATCH 1/1 ext4: extents: Remove unnecessary ‘NULL’ values from ablocks
ablocks is assigned first, so it does not need to initialize the assignment.
--- fs/ext4/extents.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ext4/extents.c +1 -1
@@ -1061,7 +1061,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,int i = at, k, m, a;ext4_fsblk_t newblock, oldblock;__le32 border; -ext4_fsblk_t *ablocks =NULL ;/* array of allocated blocks */ +ext4_fsblk_t *ablocks;/* array of allocated blocks */ gfp_t gfp_flags =GFP_NOFS ;int err =0 ;size_t ext_size =0 ;
Signature · 1 line
2.18.2
Theodore Ts'o
maintainerQuoted 2 lines · Li zeming
ablocks is assigned first, so it does not need to initialize the assignment.
That's technically true, but the compiler is perfectly capable of optimizing it out. So it's harmless, and removing it does make the code a bit more fragile, since it needs to be set so that the cleanup code doesn't accidentally dereference an uninitialized pointer.
Cheers,
- Ted
Quoted 3 lines · Li zeming
ablocks is assigned first, so it does not need to initialize the assignment.
While it is true that "ablocks" is currently set before use, this is happening a long way away from the variable declaration and also "ablocks" is used after the "cleanup:" label error case:
cleanup:
if (bh) {
if (buffer_locked(bh))
unlock_buffer(bh);
brelse(bh);
}
if (err) {
/* free all allocated blocks in error case */
for (i = 0; i < depth; i++) {
if (!ablocks[i])
continue;
ext4_free_blocks(handle, inode, NULL, ablocks[i], 1,
EXT4_FREE_BLOCKS_METADATA);
}
}
kfree(ablocks);So there is definitely a risk that a code change in the future would introduce hard-to-debug problems, crashes, or even just spurious static code analysis warnings. My recommendation would be to keep this 1-cycle local variable initialization in place rather than spend hours or days trying to debug and fix a crash here in the future.
Cheers, Andreas
Quoted 20 lines
Signed-off-by Li zeming <[email protected]>---
fs/ext4/extents.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)fs/ext4/extents.c +1
-2@@ -1061,7 +1061,7 @@ static int ext4_ext_split(handle_t *handle, struct inode *inode,int i = at, k, m, a;ext4_fsblk_t newblock, oldblock;__le32 border; -ext4_fsblk_t *ablocks =NULL ;/* array of allocated blocks */ +ext4_fsblk_t *ablocks;/* array of allocated blocks */ gfp_t gfp_flags =GFP_NOFS ;int err =0 ;size_t ext_size =0 ; --
Quoted 2 lines
2.18.2
Cheers, Andreas