GFS2: Fix unlock of fcntl locks during withdrawn state

This reminded me of another old patch I had sitting around which I never
had a chance to test.  I copied this idea from the nfs code.  The problem
is that when the kernel clears flocks/plocks during close, it calls posix
unlock even if there are no posix locks on the file.  Without this patch,
that extraneous unlock propagates up to controld, across the cluster, and
back down to the kernel.  That can amount to a lot of plock activity on a
fs that may have never used a single plock (only flocks).  With this
patch, we should detect that the unlock is extraneous (since it doesn't
exist in the vfs), and skip all the userland traffic.

Signed-off-by: David Teigland <teigland@redhat.com>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c
index 01fd5c11a7fb25b997c63630e73e9f1a38dc1a70..f704458ea5f59a78d8b1121508cc9f22acfe6e45 100644 (file)
--- a/fs/dlm/plock.c
+++ b/fs/dlm/plock.c
@@ -247,6 +247,7 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
        struct dlm_ls *ls;
        struct plock_op *op;
        int rv;
+       unsigned char fl_flags = fl->fl_flags;
 
        ls = dlm_find_lockspace_local(lockspace);
        if (!ls)
@@ -258,9 +259,18 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
                goto out;
        }
 
-       if (posix_lock_file_wait(file, fl) < 0)
-               log_error(ls, "dlm_posix_unlock: vfs unlock error %llx",
-                         (unsigned long long)number);
+       /* cause the vfs unlock to return ENOENT if lock is not found */
+       fl->fl_flags |= FL_EXISTS;
+
+       rv = posix_lock_file_wait(file, fl);
+       if (rv == -ENOENT) {
+               rv = 0;
+               goto out_free;
+       }
+       if (rv < 0) {
+               log_error(ls, "dlm_posix_unlock: vfs unlock error %d %llx",
+                         rv, (unsigned long long)number);
+       }
 
        op->info.optype         = DLM_PLOCK_OP_UNLOCK;
        op->info.pid            = fl->fl_pid;
@@ -296,9 +306,11 @@ int dlm_posix_unlock(dlm_lockspace_t *lockspace, u64 number, struct file *file,
        if (rv == -ENOENT)
                rv = 0;
 
+out_free:
        kfree(op);
 out:
        dlm_put_lockspace(ls);
+       fl->fl_flags = fl_flags;
        return rv;
 }
 EXPORT_SYMBOL_GPL(dlm_posix_unlock);