Commit e72db989 authored by Xue jiufei's avatar Xue jiufei Committed by Linus Torvalds

ocfs2: remove some unused code

dlm_recovery_ctxt.received is unused.

ocfs2_should_refresh_lock_res() can only return 0 or 1, so the error
handling code in ocfs2_super_lock() is unneeded.
Signed-off-by: default avatarjoyce.xue <xuejiufei@huawei.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mfasheh@suse.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 17bf1418
...@@ -108,7 +108,6 @@ static inline int dlm_is_recovery_lock(const char *lock_name, int name_len) ...@@ -108,7 +108,6 @@ static inline int dlm_is_recovery_lock(const char *lock_name, int name_len)
struct dlm_recovery_ctxt struct dlm_recovery_ctxt
{ {
struct list_head resources; struct list_head resources;
struct list_head received;
struct list_head node_data; struct list_head node_data;
u8 new_master; u8 new_master;
u8 dead_node; u8 dead_node;
......
...@@ -2034,7 +2034,6 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain, ...@@ -2034,7 +2034,6 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
INIT_LIST_HEAD(&dlm->list); INIT_LIST_HEAD(&dlm->list);
INIT_LIST_HEAD(&dlm->dirty_list); INIT_LIST_HEAD(&dlm->dirty_list);
INIT_LIST_HEAD(&dlm->reco.resources); INIT_LIST_HEAD(&dlm->reco.resources);
INIT_LIST_HEAD(&dlm->reco.received);
INIT_LIST_HEAD(&dlm->reco.node_data); INIT_LIST_HEAD(&dlm->reco.node_data);
INIT_LIST_HEAD(&dlm->purge_list); INIT_LIST_HEAD(&dlm->purge_list);
INIT_LIST_HEAD(&dlm->dlm_domain_handlers); INIT_LIST_HEAD(&dlm->dlm_domain_handlers);
......
...@@ -2544,11 +2544,6 @@ int ocfs2_super_lock(struct ocfs2_super *osb, ...@@ -2544,11 +2544,6 @@ int ocfs2_super_lock(struct ocfs2_super *osb,
* refreshed, so we do it here. Of course, making sense of * refreshed, so we do it here. Of course, making sense of
* everything is up to the caller :) */ * everything is up to the caller :) */
status = ocfs2_should_refresh_lock_res(lockres); status = ocfs2_should_refresh_lock_res(lockres);
if (status < 0) {
ocfs2_cluster_unlock(osb, lockres, level);
mlog_errno(status);
goto bail;
}
if (status) { if (status) {
status = ocfs2_refresh_slot_info(osb); status = ocfs2_refresh_slot_info(osb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment