ocfs2: delete unnecessary checks before three function calls
kfree(), ocfs2_free_path() and __ocfs2_free_slot_info() test whether their argument is NULL and then return immediately. Thus the test around their calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Cc: Mark Fasheh <mfasheh@suse.com> Cc: Joel Becker <jlbec@evilplan.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
1cf370c611
commit
fd90d4dfb9
|
@ -3453,8 +3453,7 @@ static int ocfs2_merge_rec_right(struct ocfs2_path *left_path,
|
|||
subtree_index);
|
||||
}
|
||||
out:
|
||||
if (right_path)
|
||||
ocfs2_free_path(right_path);
|
||||
ocfs2_free_path(right_path);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -3647,8 +3646,7 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path,
|
|||
right_path, subtree_index);
|
||||
}
|
||||
out:
|
||||
if (left_path)
|
||||
ocfs2_free_path(left_path);
|
||||
ocfs2_free_path(left_path);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -4431,11 +4429,8 @@ ocfs2_figure_merge_contig_type(struct ocfs2_extent_tree *et,
|
|||
}
|
||||
|
||||
out:
|
||||
if (left_path)
|
||||
ocfs2_free_path(left_path);
|
||||
if (right_path)
|
||||
ocfs2_free_path(right_path);
|
||||
|
||||
ocfs2_free_path(left_path);
|
||||
ocfs2_free_path(right_path);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -6996,9 +6991,7 @@ out_commit:
|
|||
out:
|
||||
if (data_ac)
|
||||
ocfs2_free_alloc_context(data_ac);
|
||||
if (pages)
|
||||
kfree(pages);
|
||||
|
||||
kfree(pages);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
|
|
@ -452,7 +452,7 @@ int ocfs2_init_slot_info(struct ocfs2_super *osb)
|
|||
|
||||
osb->slot_info = (struct ocfs2_slot_info *)si;
|
||||
bail:
|
||||
if (status < 0 && si)
|
||||
if (status < 0)
|
||||
__ocfs2_free_slot_info(si);
|
||||
|
||||
return status;
|
||||
|
|
|
@ -1063,7 +1063,7 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn)
|
|||
}
|
||||
|
||||
out:
|
||||
if (rc && lc)
|
||||
if (rc)
|
||||
kfree(lc);
|
||||
return rc;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue