[RFC dlm/next 04/11] dlm: don't track references on move_lkb()

[Alexander Aring <aahringo@redhat.com>]

A move_lkb() is to move an lkb to one statequeue to another. There is no
need to drop the reference and add the reference again after the
move is done. Adding helpers for statequeue that does not track
references so move_lkb() can use them.

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

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 42cef3d2af47..378234b42593 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -1637,10 +1637,8 @@ static void lkb_add_ordered(struct list_head *new, struct list_head *head,
 
 /* add/remove lkb to rsb's grant/convert/wait queue */
 
-static void add_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb, int status)
+static void add_lkb_noref(struct dlm_rsb *r, struct dlm_lkb *lkb, int status)
 {
-	hold_lkb(lkb);
-
 	DLM_ASSERT(!lkb->lkb_status, dlm_print_lkb(lkb););
 
 	lkb->lkb_timestamp = ktime_get();
@@ -1671,17 +1669,28 @@ static void add_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb, int status)
 	}
 }
 
-static void del_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb)
+static void add_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb, int status)
+{
+	hold_lkb(lkb);
+	add_lkb_noref(r, lkb, status);
+}
+
+static void del_lkb_noref(struct dlm_rsb *r, struct dlm_lkb *lkb)
 {
 	lkb->lkb_status = 0;
 	list_del(&lkb->lkb_statequeue);
+}
+
+static void del_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb)
+{
+	del_lkb_noref(r, lkb);
 	unhold_lkb(lkb);
 }
 
 static void move_lkb(struct dlm_rsb *r, struct dlm_lkb *lkb, int sts)
 {
-	del_lkb(r, lkb);
-	add_lkb(r, lkb, sts);
+	del_lkb_noref(r, lkb);
+	add_lkb_noref(r, lkb, sts);
 }
 
 static int msg_reply_type(int mstype)
-- 
2.43.0