diff options
| author | Alexander Aring <aahringo@redhat.com> | 2022-08-15 21:43:26 +0200 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2022-08-23 22:02:46 +0200 |
| commit | 9cb16d42717b114e8dec9d534a9d807b618e9f92 (patch) | |
| tree | 5d99ff7851e90b0069daaf4c3128ee57968e8ee4 /fs/dlm | |
| parent | fs: dlm: remove DLM_LSFL_FS from uapi (diff) | |
| download | linux-9cb16d42717b114e8dec9d534a9d807b618e9f92.tar.xz linux-9cb16d42717b114e8dec9d534a9d807b618e9f92.zip | |
fs: dlm: LSFL_CB_DELAY only for kernel lockspaces
This patch only set/clear the LSFL_CB_DELAY bit when it's actually a
kernel lockspace signaled by if ls->ls_callback_wq is set or not set in
this case. User lockspaces will never evaluate this flag.
Signed-off-by: Alexander Aring <aahringo@redhat.com>
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/ast.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c index a44cc42b6317..d60a8d8f109d 100644 --- a/fs/dlm/ast.c +++ b/fs/dlm/ast.c @@ -288,12 +288,13 @@ void dlm_callback_stop(struct dlm_ls *ls) void dlm_callback_suspend(struct dlm_ls *ls) { - mutex_lock(&ls->ls_cb_mutex); - set_bit(LSFL_CB_DELAY, &ls->ls_flags); - mutex_unlock(&ls->ls_cb_mutex); + if (ls->ls_callback_wq) { + mutex_lock(&ls->ls_cb_mutex); + set_bit(LSFL_CB_DELAY, &ls->ls_flags); + mutex_unlock(&ls->ls_cb_mutex); - if (ls->ls_callback_wq) flush_workqueue(ls->ls_callback_wq); + } } #define MAX_CB_QUEUE 25 @@ -304,11 +305,11 @@ void dlm_callback_resume(struct dlm_ls *ls) int count = 0, sum = 0; bool empty; - clear_bit(LSFL_CB_DELAY, &ls->ls_flags); - if (!ls->ls_callback_wq) return; + clear_bit(LSFL_CB_DELAY, &ls->ls_flags); + more: mutex_lock(&ls->ls_cb_mutex); list_for_each_entry_safe(lkb, safe, &ls->ls_cb_delay, lkb_cb_list) { |