ocfs2: remove kfree() redundant null checks
PATCH 1/2 ocfs2: remove kfree() redundant null checks
smatch analysis:
fs/ocfs2/alloc.c:6138 ocfs2_begin_truncate_log_recovery() info:
redundant null check on *tl_copy calling kfree()
fs/ocfs2/alloc.c:6755 ocfs2_zero_range_for_truncate() info:
redundant null check on pages calling kfree()
Cc Mark Fasheh <[email protected]>
Cc Joel Becker <[email protected]>
Cc ocfs2-devel at oss.oracle.com
Signed-off-by Tim Gardner <[email protected]>
--- fs/ocfs2/alloc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
fs/ocfs2/alloc.c +3 -7
@@ -6134,11 +6134,8 @@ bail:iput (tl_inode);brelse (tl_bh); -if (status <0 && (*tl_copy)) { -kfree (*tl_copy); - *tl_copy =NULL ; -mlog_errno (status); - } +kfree (*tl_copy); + *tl_copy =NULL ;return status; }
@@ -6751,8 +6748,7 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle,mlog_errno (ret); out: -if (pages) -kfree (pages); +kfree (pages);return ret; }
Signature · 1 line
1.7.9.5
PATCH 2/2 ocfs2: ocfs2_begin_truncate_log_recovery(): consolidate status error logging
Cc Mark Fasheh <[email protected]>
Cc Joel Becker <[email protected]>
Signed-off-by Tim Gardner <[email protected]>
--- fs/ocfs2/alloc.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
fs/ocfs2/alloc.c +5 -7
@@ -6090,10 +6090,8 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb,trace_ocfs2_begin_truncate_log_recovery (slot_num); status =ocfs2_get_truncate_log_info (osb, slot_num, &tl_inode, &tl_bh); -if (status <0 ) { -mlog_errno (status); +if (status <0 ) goto bail; - } di = (struct ocfs2_dinode *) tl_bh->b_data;
@@ -6109,7 +6107,6 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb, *tl_copy =kmalloc (tl_bh->b_size,GFP_KERNEL );if (!(*tl_copy)) { status = -ENOMEM ; -mlog_errno (status); goto bail; }
@@ -6123,10 +6120,8 @@ int ocfs2_begin_truncate_log_recovery(struct ocfs2_super *osb,ocfs2_compute_meta_ecc (osb->sb, tl_bh->b_data, &di->i_check); status =ocfs2_write_block (osb, tl_bh,INODE_CACHE (tl_inode)); -if (status <0 ) { -mlog_errno (status); +if (status <0 ) goto bail; - } } bail:
@@ -6134,6 +6129,9 @@ bail:iput (tl_inode);brelse (tl_bh); +if (status <0 ) +mlog_errno (status); +kfree (*tl_copy); *tl_copy =NULL ;
Signature · 1 line
1.7.9.5
Quoted 2 lines · Tim Gardner
fs/ocfs2/alloc.c:6138ocfs2_begin_truncate_log_recovery()info:
redundant null check on*tl_copycallingkfree()
Ignore this series. I'll resend.
rtg
Signature · 1 line
Tim Gardner tim.gardner at canonical.com