From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1279 invoked by alias); 24 Mar 2008 21:21:20 -0000 Received: (qmail 1249 invoked by uid 9453); 24 Mar 2008 21:21:19 -0000 Date: Mon, 24 Mar 2008 21:21:00 -0000 Message-ID: <20080324212118.1233.qmail@sourceware.org> From: teigland@sourceware.org To: cluster-cvs@sources.redhat.com, cluster-devel@redhat.com Subject: Cluster Project branch, RHEL5, updated. cmirror_1_1_15-16-g55dca01 X-Git-Refname: refs/heads/RHEL5 X-Git-Reftype: branch X-Git-Oldrev: c1f442a049bc5f7369ff5c88a834dab2e9b09251 X-Git-Newrev: 55dca012f902c090df399b2dc91cfa86d13f2e90 Mailing-List: contact cluster-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cluster-cvs-owner@sourceware.org X-SW-Source: 2008-q1/txt/msg00366.txt.bz2 This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Cluster Project". http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=55dca012f902c090df399b2dc91cfa86d13f2e90 The branch, RHEL5 has been updated via 55dca012f902c090df399b2dc91cfa86d13f2e90 (commit) from c1f442a049bc5f7369ff5c88a834dab2e9b09251 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 55dca012f902c090df399b2dc91cfa86d13f2e90 Author: Joel Becker Date: Wed Mar 19 16:08:49 2008 -0500 libdlm: Don't pass LKF_WAIT to the kernel libdlm is passing LKF_WAIT to the kernel. In the kernel, the unlock path strictly audits flags, and errors on this unknown (to the kernel) flag. The correct answer is to keep the flag in userspace. Signed-off-by: Joel Becker Signed-off-by: David Teigland ----------------------------------------------------------------------- Summary of changes: dlm/lib/libdlm.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlm/lib/libdlm.c b/dlm/lib/libdlm.c index 876c16e..0612d09 100644 --- a/dlm/lib/libdlm.c +++ b/dlm/lib/libdlm.c @@ -754,7 +754,7 @@ static int ls_lock_v5(dlm_lshandle_t ls, req->cmd = DLM_USER_LOCK; req->i.lock.mode = mode; - req->i.lock.flags = flags; + req->i.lock.flags = (flags & ~LKF_WAIT); req->i.lock.lkid = lksb->sb_lkid; req->i.lock.parent = parent; req->i.lock.lksb = lksb; @@ -822,7 +822,7 @@ static int ls_lock_v6(dlm_lshandle_t ls, req->cmd = DLM_USER_LOCK; req->i.lock.mode = mode; - req->i.lock.flags = flags; + req->i.lock.flags = (flags & ~LKF_WAIT); req->i.lock.lkid = lksb->sb_lkid; req->i.lock.parent = parent; req->i.lock.lksb = lksb; @@ -1014,7 +1014,7 @@ static int ls_unlock_v5(struct dlm_ls_info *lsinfo, uint32_t lkid, set_version_v5(&req); req.cmd = DLM_USER_UNLOCK; req.i.lock.lkid = lkid; - req.i.lock.flags = flags; + req.i.lock.flags = (flags & ~LKF_WAIT); req.i.lock.lksb = lksb; req.i.lock.castparam = astarg; /* DLM_USER_UNLOCK will default to existing completion AST */ @@ -1036,7 +1036,7 @@ static int ls_unlock_v6(struct dlm_ls_info *lsinfo, uint32_t lkid, req.cmd = DLM_USER_UNLOCK; req.i.lock.namelen = 0; req.i.lock.lkid = lkid; - req.i.lock.flags = flags; + req.i.lock.flags = (flags & ~LKF_WAIT); req.i.lock.lksb = lksb; req.i.lock.castparam = astarg; /* DLM_USER_UNLOCK will default to existing completion AST */ hooks/post-receive -- Cluster Project