3.10-stable patches

added patches:
	ocfs2-dlm-fix-race-between-purge-and-get-lock-resource.patch

diff --git a/queue-3.10/ocfs2-dlm-fix-race-between-purge-and-get-lock-resource.patch b/queue-3.10/ocfs2-dlm-fix-race-between-purge-and-get-lock-resource.patch
new file mode 100644 (file)
index 0000000..0dc0d1d
--- /dev/null
+++ b/queue-3.10/ocfs2-dlm-fix-race-between-purge-and-get-lock-resource.patch
@@ -0,0 +1,62 @@
+From b1432a2a35565f538586774a03bf277c27fc267d Mon Sep 17 00:00:00 2001
+From: Junxiao Bi <junxiao.bi@oracle.com>
+Date: Tue, 5 May 2015 16:24:02 -0700
+Subject: ocfs2: dlm: fix race between purge and get lock resource
+
+From: Junxiao Bi <junxiao.bi@oracle.com>
+
+commit b1432a2a35565f538586774a03bf277c27fc267d upstream.
+
+There is a race window in dlm_get_lock_resource(), which may return a
+lock resource which has been purged.  This will cause the process to
+hang forever in dlmlock() as the ast msg can't be handled due to its
+lock resource not existing.
+
+    dlm_get_lock_resource {
+        ...
+        spin_lock(&dlm->spinlock);
+        tmpres = __dlm_lookup_lockres_full(dlm, lockid, namelen, hash);
+        if (tmpres) {
+             spin_unlock(&dlm->spinlock);
+             >>>>>>>> race window, dlm_run_purge_list() may run and purge
+                              the lock resource
+             spin_lock(&tmpres->spinlock);
+             ...
+             spin_unlock(&tmpres->spinlock);
+        }
+    }
+
+Signed-off-by: Junxiao Bi <junxiao.bi@oracle.com>
+Cc: Joseph Qi <joseph.qi@huawei.com>
+Cc: Mark Fasheh <mfasheh@suse.com>
+Cc: Joel Becker <jlbec@evilplan.org>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/ocfs2/dlm/dlmmaster.c |   13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+--- a/fs/ocfs2/dlm/dlmmaster.c
++++ b/fs/ocfs2/dlm/dlmmaster.c
+@@ -729,6 +729,19 @@ lookup:
+       if (tmpres) {
+               spin_unlock(&dlm->spinlock);
+               spin_lock(&tmpres->spinlock);
++
++              /*
++               * Right after dlm spinlock was released, dlm_thread could have
++               * purged the lockres. Check if lockres got unhashed. If so
++               * start over.
++               */
++              if (hlist_unhashed(&tmpres->hash_node)) {
++                      spin_unlock(&tmpres->spinlock);
++                      dlm_lockres_put(tmpres);
++                      tmpres = NULL;
++                      goto lookup;
++              }
++
+               /* Wait on the thread that is mastering the resource */
+               if (tmpres->owner == DLM_LOCK_RES_OWNER_UNKNOWN) {
+                       __dlm_wait_on_lockres(tmpres);

diff --git a/queue-3.10/series b/queue-3.10/series
new file mode 100644 (file)
index 0000000..30531c6
--- /dev/null
+++ b/queue-3.10/series
@@ -0,0 +1 @@
+ocfs2-dlm-fix-race-between-purge-and-get-lock-resource.patch

diff --git a/queue-3.14/series b/queue-3.14/series
new file mode 100644 (file)
index 0000000..30531c6
--- /dev/null
+++ b/queue-3.14/series
@@ -0,0 +1 @@
+ocfs2-dlm-fix-race-between-purge-and-get-lock-resource.patch

diff --git a/queue-4.0/series b/queue-4.0/series
index 50bb339121be6d392b73aecdf68f15b7deeb0c34..aee7510e6b5e579b02a3f8cb1306ee2e7e2cb8ad 100644 (file)
--- a/queue-4.0/series
+++ b/queue-4.0/series
@@ -2,3 +2,5 @@ x86-spinlocks-fix-regression-in-spinlock-contention-detection.patch
 acpi-sbs-add-5-us-delay-to-fix-sbs-hangs-on-macbook.patch
 x86-pci-acpi-make-all-resources-except-available-on-pci-bus.patch
 acpi-pnp-add-two-ids-to-list-for-pnpacpi-device-enumeration.patch
+ocfs2-dlm-fix-race-between-purge-and-get-lock-resource.patch
+rtc-armada38x-fix-concurrency-access-in-armada38x_rtc_set_time.patch