Reenabled linux-xen, added patches for Xen Kernel Version 2.6.27.31,

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.fixes / ocfs2-dlm-Hold-off-sending-lockres-drop-ref-message.patch

diff --git a/src/patches/suse-2.6.27.31/patches.fixes/ocfs2-dlm-Hold-off-sending-lockres-drop-ref-message.patch b/src/patches/suse-2.6.27.31/patches.fixes/ocfs2-dlm-Hold-off-sending-lockres-drop-ref-message.patch
new file mode 100644 (file)
index 0000000..43170e7
--- /dev/null
+++ b/src/patches/suse-2.6.27.31/patches.fixes/ocfs2-dlm-Hold-off-sending-lockres-drop-ref-message.patch
@@ -0,0 +1,35 @@
+From: Sunil Mushran <sunil.mushran@oracle.com>
+Date: Tue, 16 Dec 2008 15:49:21 -0800
+Subject: ocfs2/dlm: Hold off sending lockres drop ref message while lockres is migrating
+References: BZ 450579
+Patch-mainline: 2.6.29
+
+During lockres purge, o2dlm sends a drop reference message to the lockres
+master. This patch delays the message if the lockres is being migrated.
+
+Fixes oss bugzilla#1012
+http://oss.oracle.com/bugzilla/show_bug.cgi?id=1012
+
+Signed-off-by: Sunil Mushran <sunil.mushran@oracle.com>
+Signed-off-by: Mark Fasheh <mfasheh@suse.com>
+---
+ fs/ocfs2/dlm/dlmthread.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/fs/ocfs2/dlm/dlmthread.c b/fs/ocfs2/dlm/dlmthread.c
+index 4060bb3..d129520 100644
+--- a/fs/ocfs2/dlm/dlmthread.c
++++ b/fs/ocfs2/dlm/dlmthread.c
+@@ -181,7 +181,8 @@ static int dlm_purge_lockres(struct dlm_ctxt *dlm,
+ 
+               spin_lock(&res->spinlock);
+               /* This ensures that clear refmap is sent after the set */
+-              __dlm_wait_on_lockres_flags(res, DLM_LOCK_RES_SETREF_INPROG);
++              __dlm_wait_on_lockres_flags(res, (DLM_LOCK_RES_SETREF_INPROG |
++                                                DLM_LOCK_RES_MIGRATING));
+               spin_unlock(&res->spinlock);
+ 
+               /* clear our bit from the master's refmap, ignore errors */
+-- 
+1.5.6
+