Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fd90d4df authored by Markus Elfring's avatar Markus Elfring Committed by Linus Torvalds
Browse files

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: default avatarMarkus Elfring <elfring@users.sourceforge.net>
Cc: Mark Fasheh <mfasheh@suse.com>
Cc: Joel Becker <jlbec@evilplan.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1cf370c6

fs/ocfs2/alloc.c

+5 −12
Original line number Diff line number Diff line
@@ -3453,7 +3453,6 @@ static int ocfs2_merge_rec_right(struct ocfs2_path *left_path, 
					   subtree_index);

	}

out:

	if (right_path)

	ocfs2_free_path(right_path);

	return ret;

}
@@ -3647,7 +3646,6 @@ static int ocfs2_merge_rec_left(struct ocfs2_path *right_path, 
						   right_path, subtree_index);

	}

out:

	if (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);



	return ret;

}
@@ -6996,9 +6991,7 @@ int ocfs2_convert_inline_data_to_extents(struct inode *inode, 
out:

	if (data_ac)

		ocfs2_free_alloc_context(data_ac);

	if (pages)

	kfree(pages);



	return ret;

}

fs/ocfs2/slot_map.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

fs/ocfs2/stack_user.c

+1 −1
Original line number Diff line number Diff line
@@ -1063,7 +1063,7 @@ static int user_cluster_connect(struct ocfs2_cluster_connection *conn) 
	}



out:

	if (rc && lc)

	if (rc)

		kfree(lc);

	return rc;

}