Commit:     aec64e1be2225c6fc64499594d23257c6adf6168
Parent:     601342ce022b964f756b67f2eb99b605c1afa3ed
Author:     David Teigland <[EMAIL PROTECTED]>
AuthorDate: Tue Jan 8 15:37:47 2008 -0600
Committer:  David Teigland <[EMAIL PROTECTED]>
CommitDate: Wed Jan 30 11:04:42 2008 -0600

    dlm: another call to confirm_master in receive_request_reply
    When a failed request (EBADR or ENOTBLK) is unlocked/canceled instead of
    retried, there may be other lkb's waiting on the rsb_lookup list for it
    to complete.  A call to confirm_master() is needed to move on to the next
    waiting lkb since the current one won't be retried.
    Signed-off-by: David Teigland <[EMAIL PROTECTED]>
 fs/dlm/lock.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index a758f1b..d5e8ea1 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -1940,8 +1940,11 @@ static void confirm_master(struct dlm_rsb *r, int error)
        case -EAGAIN:
-               /* the remote master didn't queue our NOQUEUE request;
-                  make a waiting lkb the first_lkid */
+       case -EBADR:
+       case -ENOTBLK:
+               /* the remote request failed and won't be retried (it was
+                  a NOQUEUE, or has been canceled/unlocked); make a waiting
+                  lkb the first_lkid */
                r->res_first_lkid = 0;
@@ -3382,6 +3385,7 @@ static void receive_request_reply(struct dlm_ls *ls, 
struct dlm_message *ms)
                if (is_overlap(lkb)) {
                        /* we'll ignore error in cancel/unlock reply */
                        queue_cast_overlap(r, lkb);
+                       confirm_master(r, result);
                        unhold_lkb(lkb); /* undoes create_lkb() */
                } else
                        _request_lock(r, lkb);
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at

Reply via email to