[RFC dlm/next 03/11] dlm: use hold_lkb() instead kref_get()

[Alexander Aring <aahringo@redhat.com>]

Using internal dlm helper to call kref_get() for a lkb.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
---
 fs/dlm/lock.c | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 32fdee78e7f5..42cef3d2af47 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -1523,6 +1523,15 @@ static int create_lkb(struct dlm_ls *ls, struct dlm_lkb **lkb_ret)
 	return _create_lkb(ls, lkb_ret, 1, ULONG_MAX);
 }
 
+/* This is only called to add a reference when the code already holds
+ * a valid reference to the lkb, so there's no need for locking.
+ */
+
+static inline void hold_lkb(struct dlm_lkb *lkb)
+{
+	kref_get(&lkb->lkb_ref);
+}
+
 static int find_lkb(struct dlm_ls *ls, uint32_t lkid, struct dlm_lkb **lkb_ret)
 {
 	struct dlm_lkb *lkb;
@@ -1536,7 +1545,7 @@ static int find_lkb(struct dlm_ls *ls, uint32_t lkid, struct dlm_lkb **lkb_ret)
 		 */
 		read_lock_bh(&ls->ls_lkbxa_lock);
 		if (kref_read(&lkb->lkb_ref))
-			kref_get(&lkb->lkb_ref);
+			hold_lkb(lkb);
 		else
 			lkb = NULL;
 		read_unlock_bh(&ls->ls_lkbxa_lock);
@@ -1593,14 +1602,6 @@ int dlm_put_lkb(struct dlm_lkb *lkb)
 	return __put_lkb(ls, lkb);
 }
 
-/* This is only called to add a reference when the code already holds
-   a valid reference to the lkb, so there's no need for locking. */
-
-static inline void hold_lkb(struct dlm_lkb *lkb)
-{
-	kref_get(&lkb->lkb_ref);
-}
-
 static void unhold_lkb_assert(struct kref *kref)
 {
 	struct dlm_lkb *lkb = container_of(kref, struct dlm_lkb, lkb_ref);
@@ -1638,7 +1639,7 @@ static void lkb_add_ordered(struct list_head *new, struct list_head *head,
 
 static void add_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb, int status)
 {
-	kref_get(&lkb->lkb_ref);
+	hold_lkb(lkb);
 
 	DLM_ASSERT(!lkb->lkb_status, dlm_print_lkb(lkb););
 
-- 
2.43.0