Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a7a2ff8a951ab373732116e7c31e2e1fe025d5e0
Commit:     a7a2ff8a951ab373732116e7c31e2e1fe025d5e0
Parent:     d88101d4d82ea09433692af30618c3b7afb7da02
Author:     David Teigland <[EMAIL PROTECTED]>
AuthorDate: Fri Jun 8 17:01:40 2007 -0500
Committer:  Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Mon Jul 9 08:23:33 2007 +0100

    [GFS2] return conflicts for GETLK
    
    We weren't returning the correct result when GETLK found a conflict,
    which is indicated by userspace passing back a 1.
    
    Signed-off-by: Abhijith Das <adas redhat com>
    Signed-off-by: David Teigland <teigland redhat com>
    Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
 fs/gfs2/locking/dlm/plock.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/fs/gfs2/locking/dlm/plock.c b/fs/gfs2/locking/dlm/plock.c
index 1dc7680..fba1f1d 100644
--- a/fs/gfs2/locking/dlm/plock.c
+++ b/fs/gfs2/locking/dlm/plock.c
@@ -254,16 +254,20 @@ int gdlm_plock_get(void *lockspace, struct lm_lockname 
*name,
        }
        spin_unlock(&ops_lock);
 
+       /* info.rv from userspace is 1 for conflict, 0 for no-conflict,
+          -ENOENT if there are no locks on the file */
+
        rv = op->info.rv;
 
        fl->fl_type = F_UNLCK;
        if (rv == -ENOENT)
                rv = 0;
-       else if (rv == 0 && op->info.pid != fl->fl_pid) {
+       else if (rv > 0) {
                fl->fl_type = (op->info.ex) ? F_WRLCK : F_RDLCK;
                fl->fl_pid = op->info.pid;
                fl->fl_start = op->info.start;
                fl->fl_end = op->info.end;
+               rv = 0;
        }
 
        kfree(op);
-
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  http://vger.kernel.org/majordomo-info.html

Reply via email to