public inbox for cluster-cvs@sourceware.org help / color / mirror / Atom feed
From: Lon Hohberger <lon@fedoraproject.org> To: cluster-cvs-relay@redhat.com Subject: RHEL4 - Revert "magma-plugins: Fix loops allowing 65539 to be passed up" Date: Wed, 17 Sep 2008 20:06:00 -0000 [thread overview] Message-ID: <20080917190603.40630C07B7@lists.fedorahosted.org> (raw) Gitweb: http://git.fedorahosted.org/git/cluster.git?p=cluster.git;a=commitdiff;h=0179f8e9edc98ace2e59cb432476e2d9dd89cfde Commit: 0179f8e9edc98ace2e59cb432476e2d9dd89cfde Parent: f1bd71ba88937e169bada8a23f23da104ba971bf Author: Lon Hohberger <lhh@redhat.com> AuthorDate: Wed Sep 17 15:04:42 2008 -0400 Committer: Lon Hohberger <lhh@redhat.com> CommitterDate: Wed Sep 17 15:04:42 2008 -0400 Revert "magma-plugins: Fix loops allowing 65539 to be passed up" This reverts commit 84ad017e8091cda3e538ab439ec4938e640fe22d. --- magma-plugins/sm/sm.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/magma-plugins/sm/sm.c b/magma-plugins/sm/sm.c index caafac2..6867b81 100644 --- a/magma-plugins/sm/sm.c +++ b/magma-plugins/sm/sm.c @@ -578,14 +578,14 @@ _dlm_lock(sm_priv_t *p, int mode, struct dlm_lksb *lksb, int options, if (ret < 0) return -1; - while (lksb.sb_status == EINPROG) { - if (wait_for_dlm_event(p->ls) < 0) { - if (lksb->sb_status == EINPROG) - continue; - errno = lksb->sb_status; - return -1; - } - } + while ((ret = (wait_for_dlm_event(p->ls) < 0))) { + /* If nothing much has happened, just + wait a bit longer */ + if (lksb->sb_status == EINPROG) + continue; + errno = lksb->sb_status; + return -1; + } /* Got the lock ! */ return 0; @@ -652,14 +652,14 @@ _dlm_unlock(sm_priv_t *p, struct dlm_lksb *lksb) /* lksb->sb_status should be EINPROG at this point */ - while (lksb.sb_status == EINPROG) { - if (wait_for_dlm_event(p->ls) < 0) { - if (lksb->sb_status == EINPROG) - continue; - errno = lksb->sb_status; - return -1; - } - } + while (wait_for_dlm_event(p->ls) < 0) { + /* If nothing much has happened, just + wait a bit longer */ + if (lksb->sb_status == EINPROG) + continue; + errno = lksb->sb_status; + return -1; + } return 0; }
reply other threads:[~2008-09-17 19:07 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20080917190603.40630C07B7@lists.fedorahosted.org \ --to=lon@fedoraproject.org \ --cc=cluster-cvs-relay@redhat.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).