dlm: use workqueue for callbacks

Instead of creating our own kthread (dlm_astd) to deliver
callbacks for all lockspaces, use a per-lockspace workqueue
to deliver the callbacks.  This eliminates complications and
slowdowns from many lockspaces sharing the same thread.

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

1 files changed, 3 insertions, 9 deletions

diff --git a/fs/dlm/recoverd.c b/fs/dlm/recoverd.c
index fd677c8c3d3b..774da3cf92c6 100644
--- a/fs/dlm/recoverd.c
+++ b/fs/dlm/recoverd.c
@@ -58,13 +58,7 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
         mutex_lock(&ls->ls_recoverd_active);
 
-        /*
-         * Suspending and resuming dlm_astd ensures that no lkb's from this ls
-         * will be processed by dlm_astd during recovery.
-         */
-
-        dlm_astd_suspend();
-        dlm_astd_resume();
+        dlm_callback_suspend(ls);
 
         /*
          * Free non-master tossed rsb's.  Master rsb's are kept on toss
@@ -202,6 +196,8 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
         dlm_adjust_timeouts(ls);
 
+        dlm_callback_resume(ls);
+
         error = enable_locking(ls, rv->seq);
         if (error) {
                 log_debug(ls, "enable_locking failed %d", error);
@@ -222,8 +218,6 @@ static int ls_recover(struct dlm_ls *ls, struct dlm_recover *rv)
 
         dlm_grant_after_purge(ls);
 
-        dlm_astd_wake();
-
         log_debug(ls, "recover %llx done: %u ms",
                   (unsigned long long)rv->seq,
                   jiffies_to_msecs(jiffies - start));