Imported linux-2.6.27.39 suse/xen patches.

[people/pmueller/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / dlm-ignore-cancel-on-granted-lock.patch

diff --git a/src/patches/suse-2.6.27.31/patches.suse/dlm-ignore-cancel-on-granted-lock.patch b/src/patches/suse-2.6.27.31/patches.suse/dlm-ignore-cancel-on-granted-lock.patch
deleted file mode 100644 (file)
index 7c4d6f1..0000000
--- a/src/patches/suse-2.6.27.31/patches.suse/dlm-ignore-cancel-on-granted-lock.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: David Teigland <teigland@redhat.com>
-commit a536e38125fe5da8ed49690f30c30a8f651cf1f5
-Author: David Teigland <teigland@redhat.com>
-Date:   Fri Feb 27 15:23:28 2009 -0600
-Subject: dlm: ignore cancel on granted lock
-    
-    Return immediately from dlm_unlock(CANCEL) if the lock is
-    granted and not being converted; there's nothing to cancel.
-    
-Signed-off-by: David Teigland <teigland@redhat.com>
-Signed-off-by: Coly Li <coly.li@suse.de>
-
-diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
-index 8cb9204..205ec95 100644
---- a/fs/dlm/lock.c
-+++ b/fs/dlm/lock.c
-@@ -2186,6 +2186,13 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
-                       goto out;
-               }
- 
-+              /* there's nothing to cancel */
-+              if (lkb->lkb_status == DLM_LKSTS_GRANTED &&
-+                  !lkb->lkb_wait_type) {
-+                      rv = -EBUSY;
-+                      goto out;
-+              }
-+
-               switch (lkb->lkb_wait_type) {
-               case DLM_MSG_LOOKUP:
-               case DLM_MSG_REQUEST: