dlm: use LSFL_FS to check for kernel lockspace

The existing external lockspace flag DLM_LSFL_FS is now also
saved as an internal flag LSFL_FS, so it can be checked from
other code locations which want to know if a lockspace is
used from the kernel or user space.

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 59711486d80128f8040ab68f763ae3d5bfb900b7..52ce270313148591e5e2a9e7ab137d138cece20e 100644 (file)
--- a/fs/dlm/ast.c
+++ b/fs/dlm/ast.c
@@ -161,6 +161,9 @@ void dlm_add_cb(struct dlm_lkb *lkb, uint32_t flags, int mode, int status,
 
 int dlm_callback_start(struct dlm_ls *ls)
 {
+       if (!test_bit(LSFL_FS, &ls->ls_flags))
+               return 0;
+
        ls->ls_callback_wq = alloc_ordered_workqueue("dlm_callback",
                                                     WQ_HIGHPRI | WQ_MEM_RECLAIM);
        if (!ls->ls_callback_wq) {
@@ -178,13 +181,15 @@ void dlm_callback_stop(struct dlm_ls *ls)
 
 void dlm_callback_suspend(struct dlm_ls *ls)
 {
-       if (ls->ls_callback_wq) {
-               spin_lock_bh(&ls->ls_cb_lock);
-               set_bit(LSFL_CB_DELAY, &ls->ls_flags);
-               spin_unlock_bh(&ls->ls_cb_lock);
+       if (!test_bit(LSFL_FS, &ls->ls_flags))
+               return;
 
+       spin_lock_bh(&ls->ls_cb_lock);
+       set_bit(LSFL_CB_DELAY, &ls->ls_flags);
+       spin_unlock_bh(&ls->ls_cb_lock);
+
+       if (ls->ls_callback_wq)
                flush_workqueue(ls->ls_callback_wq);
-       }
 }
 
 #define MAX_CB_QUEUE 25
@@ -195,7 +200,7 @@ void dlm_callback_resume(struct dlm_ls *ls)
        int count = 0, sum = 0;
        bool empty;
 
-       if (!ls->ls_callback_wq)
+       if (!test_bit(LSFL_FS, &ls->ls_flags))
                return;
 
 more:

diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
index e06fa17c5603792a139cb67bdecd0b42715c2c63..c6baf25b9caeb07aa22b56bee993ce12a97519d9 100644 (file)
--- a/fs/dlm/dlm_internal.h
+++ b/fs/dlm/dlm_internal.h
@@ -698,6 +698,7 @@ struct dlm_ls {
 #define LSFL_CB_DELAY          9
 #define LSFL_NODIR             10
 #define LSFL_RECV_MSG_BLOCKED  11
+#define LSFL_FS                        12
 
 #define DLM_PROC_FLAGS_CLOSING 1
 #define DLM_PROC_FLAGS_COMPAT  2

diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
index 3990880faea77fce8c6f80f857aa74a35113c9cf..8a4351ee9a4217d9b31a2e4eabd89519b3d8e8c6 100644 (file)
--- a/fs/dlm/lockspace.c
+++ b/fs/dlm/lockspace.c
@@ -499,12 +499,13 @@ static int new_lockspace(const char *name, const char *cluster,
        list_add(&ls->ls_list, &lslist);
        spin_unlock_bh(&lslist_lock);
 
-       if (flags & DLM_LSFL_FS) {
-               error = dlm_callback_start(ls);
-               if (error) {
-                       log_error(ls, "can't start dlm_callback %d", error);
-                       goto out_delist;
-               }
+       if (flags & DLM_LSFL_FS)
+               set_bit(LSFL_FS, &ls->ls_flags);
+
+       error = dlm_callback_start(ls);
+       if (error) {
+               log_error(ls, "can't start dlm_callback %d", error);
+               goto out_delist;
        }
 
        init_waitqueue_head(&ls->ls_recover_lock_wait);