summaryrefslogtreecommitdiff
path: root/fs/dlm/user.c
diff options
context:
space:
mode:
authorAlexander Aring <aahringo@redhat.com>2023-03-06 23:48:14 +0300
committerDavid Teigland <teigland@redhat.com>2023-03-07 00:49:07 +0300
commit8c11ba64ce577a993701616e335319a0afbbd49a (patch)
treec5c9f015a3c4d79d9470752177871e92076ec80d /fs/dlm/user.c
parent9f48eead5ea4c55692dd5628699a0d5715416615 (diff)
downloadlinux-8c11ba64ce577a993701616e335319a0afbbd49a.tar.xz
fs: dlm: store lkb distributed flags into own value
This patch stores lkb distributed flags value in an separate value instead of sharing internal and distributed flags in lkb->lkb_flags value. This has the advantage to not mask/write back flag values in receive_flags() functionality. The dlm debug_fs does not provide the distributed flags anymore, those can be added in future. Signed-off-by: Alexander Aring <aahringo@redhat.com> Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/user.c')
-rw-r--r--fs/dlm/user.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c
index 0951ca5754e2..dd4b9c8f226c 100644
--- a/fs/dlm/user.c
+++ b/fs/dlm/user.c
@@ -183,7 +183,8 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,
struct dlm_user_proc *proc;
int rv;
- if (lkb->lkb_flags & (DLM_IFL_ORPHAN | DLM_IFL_DEAD))
+ if (lkb->lkb_dflags & DLM_DFL_ORPHAN ||
+ lkb->lkb_flags & DLM_IFL_DEAD)
return;
ls = lkb->lkb_resource->res_ls;
@@ -195,7 +196,8 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, uint32_t flags, int mode,
for cases where a completion ast is received for an operation that
began before clear_proc_locks did its cancel/unlock. */
- if (lkb->lkb_flags & (DLM_IFL_ORPHAN | DLM_IFL_DEAD))
+ if (lkb->lkb_dflags & DLM_DFL_ORPHAN ||
+ lkb->lkb_flags & DLM_IFL_DEAD)
goto out;
DLM_ASSERT(lkb->lkb_ua, dlm_print_lkb(lkb););