aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ocfs2/dlm/dlmcommon.h1
-rw-r--r--fs/ocfs2/dlm/dlmdomain.c1
-rw-r--r--fs/ocfs2/dlmglue.c5
3 files changed, 0 insertions, 7 deletions
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index e0517762fcc0..a106b3f2b22a 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -108,7 +108,6 @@ static inline int dlm_is_recovery_lock(const char *lock_name, int name_len)
108struct dlm_recovery_ctxt 108struct dlm_recovery_ctxt
109{ 109{
110 struct list_head resources; 110 struct list_head resources;
111 struct list_head received;
112 struct list_head node_data; 111 struct list_head node_data;
113 u8 new_master; 112 u8 new_master;
114 u8 dead_node; 113 u8 dead_node;
diff --git a/fs/ocfs2/dlm/dlmdomain.c b/fs/ocfs2/dlm/dlmdomain.c
index 8d4690795a5d..39efc5057a36 100644
--- a/fs/ocfs2/dlm/dlmdomain.c
+++ b/fs/ocfs2/dlm/dlmdomain.c
@@ -2034,7 +2034,6 @@ static struct dlm_ctxt *dlm_alloc_ctxt(const char *domain,
2034 INIT_LIST_HEAD(&dlm->list); 2034 INIT_LIST_HEAD(&dlm->list);
2035 INIT_LIST_HEAD(&dlm->dirty_list); 2035 INIT_LIST_HEAD(&dlm->dirty_list);
2036 INIT_LIST_HEAD(&dlm->reco.resources); 2036 INIT_LIST_HEAD(&dlm->reco.resources);
2037 INIT_LIST_HEAD(&dlm->reco.received);
2038 INIT_LIST_HEAD(&dlm->reco.node_data); 2037 INIT_LIST_HEAD(&dlm->reco.node_data);
2039 INIT_LIST_HEAD(&dlm->purge_list); 2038 INIT_LIST_HEAD(&dlm->purge_list);
2040 INIT_LIST_HEAD(&dlm->dlm_domain_handlers); 2039 INIT_LIST_HEAD(&dlm->dlm_domain_handlers);
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c
index 6bd690b5a061..52cfe99ae056 100644
--- a/fs/ocfs2/dlmglue.c
+++ b/fs/ocfs2/dlmglue.c
@@ -2544,11 +2544,6 @@ int ocfs2_super_lock(struct ocfs2_super *osb,
2544 * refreshed, so we do it here. Of course, making sense of 2544 * refreshed, so we do it here. Of course, making sense of
2545 * everything is up to the caller :) */ 2545 * everything is up to the caller :) */
2546 status = ocfs2_should_refresh_lock_res(lockres); 2546 status = ocfs2_should_refresh_lock_res(lockres);
2547 if (status < 0) {
2548 ocfs2_cluster_unlock(osb, lockres, level);
2549 mlog_errno(status);
2550 goto bail;
2551 }
2552 if (status) { 2547 if (status) {
2553 status = ocfs2_refresh_slot_info(osb); 2548 status = ocfs2_refresh_slot_info(osb);
2554 2549