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

Commit d787ab09 authored by Tim Gardner's avatar Tim Gardner Committed by Linus Torvalds
Browse files

ocfs2: remove kfree() redundant null checks 



smatch analysis indicates a number of redundant NULL checks before
calling kfree(), eg:

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

etc....

[akpm@linux-foundation.org: revert dubious change in ocfs2_begin_truncate_log_recovery()]
Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
Cc: Mark Fasheh <mfasheh@suse.com>
Acked-by: default avatarJoel 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 49deb4bc

fs/ocfs2/alloc.c

+1 −2
Original line number Diff line number Diff line
@@ -6751,7 +6751,6 @@ int ocfs2_zero_range_for_truncate(struct inode *inode, handle_t *handle, 
		mlog_errno(ret);



out:

	if (pages)

	kfree(pages);



	return ret;

fs/ocfs2/cluster/heartbeat.c

+2 −4
Original line number Diff line number Diff line
@@ -1471,7 +1471,6 @@ static void o2hb_region_release(struct config_item *item) 


	mlog(ML_HEARTBEAT, "hb region release (%s)\n", reg->hr_dev_name);



	if (reg->hr_tmp_block)

	kfree(reg->hr_tmp_block);



	if (reg->hr_slot_data) {
@@ -1486,7 +1485,6 @@ static void o2hb_region_release(struct config_item *item) 
	if (reg->hr_bdev)

		blkdev_put(reg->hr_bdev, FMODE_READ|FMODE_WRITE);



	if (reg->hr_slots)

	kfree(reg->hr_slots);



	kfree(reg->hr_db_regnum);

fs/ocfs2/cluster/tcp.c

+2 −4
Original line number Diff line number Diff line
@@ -1165,9 +1165,7 @@ int o2net_send_message_vec(u32 msg_type, u32 key, struct kvec *caller_vec, 
	o2net_debug_del_nst(&nst); /* must be before dropping sc and node */

	if (sc)

		sc_put(sc);

	if (vec)

	kfree(vec);

	if (msg)

	kfree(msg);

	o2net_complete_nsw(nn, &nsw, 0, 0, 0);

	return ret;

fs/ocfs2/dlm/dlmdomain.c

+1 −3
Original line number Diff line number Diff line
@@ -319,9 +319,7 @@ static void dlm_free_ctxt_mem(struct dlm_ctxt *dlm) 
	if (dlm->master_hash)

		dlm_free_pagevec((void **)dlm->master_hash, DLM_HASH_PAGES);



	if (dlm->name)

	kfree(dlm->name);



	kfree(dlm);

}

fs/ocfs2/extent_map.c

+1 −2
Original line number Diff line number Diff line
@@ -282,7 +282,6 @@ void ocfs2_extent_map_insert_rec(struct inode *inode, 
	spin_unlock(&oi->ip_lock);



out:

	if (new_emi)

	kfree(new_emi);

}