aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/ocfs2/dlm/dlmcommon.h7
-rw-r--r--fs/ocfs2/dlm/dlmmaster.c5
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/ocfs2/dlm/dlmcommon.h b/fs/ocfs2/dlm/dlmcommon.h
index 3b67536876..87612819c1 100644
--- a/fs/ocfs2/dlm/dlmcommon.h
+++ b/fs/ocfs2/dlm/dlmcommon.h
@@ -690,7 +690,12 @@ void dlm_lockres_calc_usage(struct dlm_ctxt *dlm,
690 struct dlm_lock_resource *res); 690 struct dlm_lock_resource *res);
691void dlm_purge_lockres(struct dlm_ctxt *dlm, 691void dlm_purge_lockres(struct dlm_ctxt *dlm,
692 struct dlm_lock_resource *lockres); 692 struct dlm_lock_resource *lockres);
693void dlm_lockres_get(struct dlm_lock_resource *res); 693static inline void dlm_lockres_get(struct dlm_lock_resource *res)
694{
695 /* This is called on every lookup, so it might be worth
696 * inlining. */
697 kref_get(&res->refs);
698}
694void dlm_lockres_put(struct dlm_lock_resource *res); 699void dlm_lockres_put(struct dlm_lock_resource *res);
695void __dlm_unhash_lockres(struct dlm_lock_resource *res); 700void __dlm_unhash_lockres(struct dlm_lock_resource *res);
696void __dlm_insert_lockres(struct dlm_ctxt *dlm, 701void __dlm_insert_lockres(struct dlm_ctxt *dlm,
diff --git a/fs/ocfs2/dlm/dlmmaster.c b/fs/ocfs2/dlm/dlmmaster.c
index 953aa8421b..f1fbf2f4e5 100644
--- a/fs/ocfs2/dlm/dlmmaster.c
+++ b/fs/ocfs2/dlm/dlmmaster.c
@@ -579,11 +579,6 @@ static void dlm_lockres_release(struct kref *kref)
579 kfree(res); 579 kfree(res);
580} 580}
581 581
582void dlm_lockres_get(struct dlm_lock_resource *res)
583{
584 kref_get(&res->refs);
585}
586
587void dlm_lockres_put(struct dlm_lock_resource *res) 582void dlm_lockres_put(struct dlm_lock_resource *res)
588{ 583{
589 kref_put(&res->refs, dlm_lockres_release); 584 kref_put(&res->refs, dlm_lockres_release);