Commit 6ae07548 authored Oct 09, 2014 by Xue jiufei Committed by Linus Torvalds Oct 09, 2014

ocfs2: remove unused code in dlm_new_lockres()

Remove the branch that free res->lockname.name because the condition
is never satisfied when jump to label error.

Signed-off-by: joyce.xue <xuejiufei@huawei.com>
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>

parent 9a7e6b5a

fs/ocfs2/dlm/dlmmaster.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -625,9 +625,6 @@ struct dlm_lock_resource dlm_new_lockres(struct dlm_ctxt dlm,
		return res;

		error:
		if (res && res->lockname.name)
		kmem_cache_free(dlm_lockname_cache, (void *)res->lockname.name);

		if (res)
		kmem_cache_free(dlm_lockres_cache, res);
		return NULL;

Admin message