fs: dlm: move last cast bast time to function call

This patch moves the debugging information of the last cast and bast
time when calling the last and bast function call.

Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>

diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c
index 3e76ec75bc5559490ade171b082cbb95296750a5..8393d2090c1cc9139ffcebc2a2b98b998f02a841 100644 (file)
--- a/fs/dlm/ast.c
+++ b/fs/dlm/ast.c
@@ -158,15 +158,11 @@ int dlm_rem_lkb_callback(struct dlm_ls *ls, struct dlm_lkb *lkb,
                }
        }
 
-       if (cb->flags & DLM_CB_CAST) {
+       if (cb->flags & DLM_CB_CAST)
                memcpy(&lkb->lkb_last_cast, cb, sizeof(struct dlm_callback));
-               lkb->lkb_last_cast_time = ktime_get();
-       }
 
-       if (cb->flags & DLM_CB_BAST) {
+       if (cb->flags & DLM_CB_BAST)
                memcpy(&lkb->lkb_last_bast, cb, sizeof(struct dlm_callback));
-               lkb->lkb_last_bast_time = ktime_get();
-       }
        rv = 0;
  out:
        return rv;
@@ -256,11 +252,13 @@ void dlm_callback_work(struct work_struct *work)
                        continue;
                } else if (callbacks[i].flags & DLM_CB_BAST) {
                        trace_dlm_bast(ls, lkb, callbacks[i].mode);
+                       lkb->lkb_last_bast_time = ktime_get();
                        bastfn(lkb->lkb_astparam, callbacks[i].mode);
                } else if (callbacks[i].flags & DLM_CB_CAST) {
                        lkb->lkb_lksb->sb_status = callbacks[i].sb_status;
                        lkb->lkb_lksb->sb_flags = callbacks[i].sb_flags;
                        trace_dlm_ast(ls, lkb);
+                       lkb->lkb_last_cast_time = ktime_get();
                        castfn(lkb->lkb_astparam);
                }
        }