ocfs2: remove unused code in dlm_new_lockres()
authorXue jiufei <xuejiufei@huawei.com>
Thu, 9 Oct 2014 22:25:03 +0000 (15:25 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 10 Oct 2014 02:25:47 +0000 (22:25 -0400)
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>
fs/ocfs2/dlm/dlmmaster.c

index 12ba682fc53c303964ee4eb2c0035c88765573d0..215e41abf101a1e70afbe2b151980ed237a632a0 100644 (file)
@@ -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;