diff options
| author | David Teigland <teigland@redhat.com> | 2008-12-09 18:55:46 +0100 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-12-23 17:16:46 +0100 |
| commit | fd22a51bcc0b7b76fc729b02316214fd979f9fe1 (patch) | |
| tree | e23326bb9df7cf0ee76b3b6b61c82364ff0aed78 /fs/dlm/lock.c | |
| parent | dlm: remove extra blocking callback check (diff) | |
| download | linux-fd22a51bcc0b7b76fc729b02316214fd979f9fe1.tar.xz linux-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/lock.c')
| -rw-r--r-- | fs/dlm/lock.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index 724ddac91538..7b758dadbdd6 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -307,7 +307,7 @@ static void queue_cast(struct dlm_rsb *r, struct dlm_lkb *lkb, int rv) lkb->lkb_lksb->sb_status = rv; lkb->lkb_lksb->sb_flags = lkb->lkb_sbflags; - dlm_add_ast(lkb, AST_COMP); + dlm_add_ast(lkb, AST_COMP, 0); } static inline void queue_cast_overlap(struct dlm_rsb *r, struct dlm_lkb *lkb) @@ -320,10 +320,8 @@ static void queue_bast(struct dlm_rsb *r, struct dlm_lkb *lkb, int rqmode) { if (is_master_copy(lkb)) send_bast(r, lkb, rqmode); - else { - lkb->lkb_bastmode = rqmode; - dlm_add_ast(lkb, AST_BAST); - } + else + dlm_add_ast(lkb, AST_BAST, rqmode); } /* |