projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9a7e6b5
)
ocfs2: remove unused code in dlm_new_lockres()
author
Xue jiufei
<
[email protected]
>
Thu, 9 Oct 2014 22:25:03 +0000
(15:25 -0700)
committer
Linus Torvalds
<
[email protected]
>
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 <
[email protected]
>
Cc: Mark Fasheh <
[email protected]
>
Cc: Joel Becker <
[email protected]
>
Signed-off-by: Andrew Morton <
[email protected]
>
Signed-off-by: Linus Torvalds <
[email protected]
>
fs/ocfs2/dlm/dlmmaster.c
patch
|
blob
|
history
diff --git
a/fs/ocfs2/dlm/dlmmaster.c
b/fs/ocfs2/dlm/dlmmaster.c
index 12ba682fc53c303964ee4eb2c0035c88765573d0..215e41abf101a1e70afbe2b151980ed237a632a0 100644
(file)
--- a/
fs/ocfs2/dlm/dlmmaster.c
+++ b/
fs/ocfs2/dlm/dlmmaster.c
@@
-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;