diff options
-rw-r--r-- | fs/ocfs2/dlm/dlmcommon.h | 2 | ||||
-rw-r--r-- | fs/ocfs2/dlm/dlmrecovery.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h index 9bdc9cf65991..14530ee7e11d 100644 --- a/fs/ocfs2/dlm/dlmcommon.h +++ b/fs/ocfs2/dlm/dlmcommon.h | |||
@@ -822,8 +822,6 @@ int dlm_begin_reco_handler(struct o2net_msg *msg, u32 len, void *data); | |||
822 | int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data); | 822 | int dlm_finalize_reco_handler(struct o2net_msg *msg, u32 len, void *data); |
823 | int dlm_do_master_requery(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, | 823 | int dlm_do_master_requery(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, |
824 | u8 nodenum, u8 *real_master); | 824 | u8 nodenum, u8 *real_master); |
825 | int dlm_lockres_master_requery(struct dlm_ctxt *dlm, | ||
826 | struct dlm_lock_resource *res, u8 *real_master); | ||
827 | 825 | ||
828 | 826 | ||
829 | int dlm_dispatch_assert_master(struct dlm_ctxt *dlm, | 827 | int dlm_dispatch_assert_master(struct dlm_ctxt *dlm, |
diff --git a/fs/ocfs2/dlm/dlmrecovery.c b/fs/ocfs2/dlm/dlmrecovery.c index 29b2845f370d..594745fab0b5 100644 --- a/fs/ocfs2/dlm/dlmrecovery.c +++ b/fs/ocfs2/dlm/dlmrecovery.c | |||
@@ -95,6 +95,9 @@ static void dlm_reco_unlock_ast(void *astdata, enum dlm_status st); | |||
95 | static void dlm_request_all_locks_worker(struct dlm_work_item *item, | 95 | static void dlm_request_all_locks_worker(struct dlm_work_item *item, |
96 | void *data); | 96 | void *data); |
97 | static void dlm_mig_lockres_worker(struct dlm_work_item *item, void *data); | 97 | static void dlm_mig_lockres_worker(struct dlm_work_item *item, void *data); |
98 | static int dlm_lockres_master_requery(struct dlm_ctxt *dlm, | ||
99 | struct dlm_lock_resource *res, | ||
100 | u8 *real_master); | ||
98 | 101 | ||
99 | static u64 dlm_get_next_mig_cookie(void); | 102 | static u64 dlm_get_next_mig_cookie(void); |
100 | 103 | ||
@@ -1484,8 +1487,9 @@ leave: | |||
1484 | 1487 | ||
1485 | 1488 | ||
1486 | 1489 | ||
1487 | int dlm_lockres_master_requery(struct dlm_ctxt *dlm, | 1490 | static int dlm_lockres_master_requery(struct dlm_ctxt *dlm, |
1488 | struct dlm_lock_resource *res, u8 *real_master) | 1491 | struct dlm_lock_resource *res, |
1492 | u8 *real_master) | ||
1489 | { | 1493 | { |
1490 | struct dlm_node_iter iter; | 1494 | struct dlm_node_iter iter; |
1491 | int nodenum; | 1495 | int nodenum; |