diff options
| author | David Teigland <teigland@redhat.com> | 2008-12-09 11:55:46 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-12-23 10:16:46 -0600 |
| commit | fd22a51bcc0b7b76fc729b02316214fd979f9fe1 (patch) | |
| tree | e23326bb9df7cf0ee76b3b6b61c82364ff0aed78 /fs/dlm/user.c | |
| parent | 03339696314fffb95dafb349b84243358e945ce6 (diff) | |
| download | kernel-crypto-fd22a51bcc0b7b76fc729b02316214fd979f9fe1.tar.gz kernel-crypto-fd22a51bcc0b7b76fc729b02316214fd979f9fe1.tar.xz kernel-crypto-fd22a51bcc0b7b76fc729b02316214fd979f9fe1.zip | |
dlm: improve how bast mode handling
The lkb bastmode value is set in the context of processing the
lock, and read by the dlm_astd thread. Because it's accessed
in these two separate contexts, the writing/reading ought to
be done under a lock. This is simple to do by setting it and
reading it when the lkb is added to and removed from dlm_astd's
callback list which is properly locked.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm/user.c')
| -rw-r--r-- | fs/dlm/user.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/dlm/user.c b/fs/dlm/user.c index b3832c67194..065149e84f4 100644 --- a/fs/dlm/user.c +++ b/fs/dlm/user.c @@ -175,7 +175,7 @@ static int lkb_is_endoflife(struct dlm_lkb *lkb, int sb_status, int type) /* we could possibly check if the cancel of an orphan has resulted in the lkb being removed and then remove that lkb from the orphans list and free it */ -void dlm_user_add_ast(struct dlm_lkb *lkb, int type) +void dlm_user_add_ast(struct dlm_lkb *lkb, int type, int bastmode) { struct dlm_ls *ls; struct dlm_user_args *ua; @@ -208,6 +208,8 @@ void dlm_user_add_ast(struct dlm_lkb *lkb, int type) ast_type = lkb->lkb_ast_type; lkb->lkb_ast_type |= type; + if (bastmode) + lkb->lkb_bastmode = bastmode; if (!ast_type) { kref_get(&lkb->lkb_ref); |