aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ocfs2/dlm/dlmcommon.h6
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c8
-rw-r--r--fs/ocfs2/dlm/dlmthread.c3
3 files changed, 7 insertions, 10 deletions
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 9fa427119a3c..04048bb1a1bd 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -739,8 +739,6 @@ void __dlm_lockres_calc_usage(struct dlm_ctxt *dlm,
739 struct dlm_lock_resource *res); 739 struct dlm_lock_resource *res);
740void dlm_lockres_calc_usage(struct dlm_ctxt *dlm, 740void dlm_lockres_calc_usage(struct dlm_ctxt *dlm,
741 struct dlm_lock_resource *res); 741 struct dlm_lock_resource *res);
742int dlm_purge_lockres(struct dlm_ctxt *dlm,
743 struct dlm_lock_resource *lockres);
744static inline void dlm_lockres_get(struct dlm_lock_resource *res) 742static inline void dlm_lockres_get(struct dlm_lock_resource *res)
745{ 743{
746 /* This is called on every lookup, so it might be worth 744 /* This is called on every lookup, so it might be worth
@@ -864,10 +862,6 @@ int dlm_heartbeat_init(struct dlm_ctxt *dlm);
864void dlm_hb_node_down_cb(struct o2nm_node *node, int idx, void *data); 862void dlm_hb_node_down_cb(struct o2nm_node *node, int idx, void *data);
865void dlm_hb_node_up_cb(struct o2nm_node *node, int idx, void *data); 863void dlm_hb_node_up_cb(struct o2nm_node *node, int idx, void *data);
866 864
867int dlm_lockres_is_dirty(struct dlm_ctxt *dlm, struct dlm_lock_resource *res);
868int dlm_migrate_lockres(struct dlm_ctxt *dlm,
869 struct dlm_lock_resource *res,
870 u8 target);
871int dlm_empty_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res); 865int dlm_empty_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res);
872int dlm_finish_migration(struct dlm_ctxt *dlm, 866int dlm_finish_migration(struct dlm_ctxt *dlm,
873 struct dlm_lock_resource *res, 867 struct dlm_lock_resource *res,
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 4645ec2e0fc3..251c48028ea3 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -2327,8 +2327,9 @@ done:
2327 */ 2327 */
2328 2328
2329 2329
2330int dlm_migrate_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res, 2330static int dlm_migrate_lockres(struct dlm_ctxt *dlm,
2331 u8 target) 2331 struct dlm_lock_resource *res,
2332 u8 target)
2332{ 2333{
2333 struct dlm_master_list_entry *mle = NULL; 2334 struct dlm_master_list_entry *mle = NULL;
2334 struct dlm_master_list_entry *oldmle = NULL; 2335 struct dlm_master_list_entry *oldmle = NULL;
@@ -2676,7 +2677,8 @@ static int dlm_migration_can_proceed(struct dlm_ctxt *dlm,
2676 return can_proceed; 2677 return can_proceed;
2677} 2678}
2678 2679
2679int dlm_lockres_is_dirty(struct dlm_ctxt *dlm, struct dlm_lock_resource *res) 2680static int dlm_lockres_is_dirty(struct dlm_ctxt *dlm,
2681 struct dlm_lock_resource *res)
2680{ 2682{
2681 int ret; 2683 int ret;
2682 spin_lock(&res->spinlock); 2684 spin_lock(&res->spinlock);
diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
index 620eb824ce1d..baa99979904c 100644
--- a/fs/ocfs2/dlm/dlmthread.c
+++ b/fs/ocfs2/dlm/dlmthread.c
@@ -154,7 +154,8 @@ void dlm_lockres_calc_usage(struct dlm_ctxt *dlm,
154 spin_unlock(&dlm->spinlock); 154 spin_unlock(&dlm->spinlock);
155} 155}
156 156
157int dlm_purge_lockres(struct dlm_ctxt *dlm, struct dlm_lock_resource *res) 157static int dlm_purge_lockres(struct dlm_ctxt *dlm,
158 struct dlm_lock_resource *res)
158{ 159{
159 int master; 160 int master;
160 int ret = 0; 161 int ret = 0;