Imported linux-2.6.27.39 suse/xen patches.

[people/teissler/ipfire-2.x.git] / src / patches / suse-2.6.27.31 / patches.suse / dlm-fix-locking-of-lockspace-list-in-dlm_scand.patch

diff --git a/src/patches/suse-2.6.27.31/patches.suse/dlm-fix-locking-of-lockspace-list-in-dlm_scand.patch b/src/patches/suse-2.6.27.31/patches.suse/dlm-fix-locking-of-lockspace-list-in-dlm_scand.patch
deleted file mode 100644 (file)
index 06d9c5c..0000000
--- a/src/patches/suse-2.6.27.31/patches.suse/dlm-fix-locking-of-lockspace-list-in-dlm_scand.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: David Teigland <teigland@redhat.com>
-commit c1dcf65ffc5796bf4ff75c13f448e63b3a416fd6
-Author: David Teigland <teigland@redhat.com>
-Date:   Mon Aug 18 14:03:25 2008 -0500
-Subject: dlm: fix locking of lockspace list in dlm_scand
-    
-    The dlm_scand thread needs to lock the list of lockspaces
-    when going through it.
-    
-Signed-off-by: David Teigland <teigland@redhat.com>
-Signed-off-by: Coly Li <coly.li@suse.de>
-
-diff --git a/fs/dlm/dlm_internal.h b/fs/dlm/dlm_internal.h
-index 9e0622a..868e4c9 100644
---- a/fs/dlm/dlm_internal.h
-+++ b/fs/dlm/dlm_internal.h
-@@ -445,6 +445,7 @@ struct dlm_ls {
-                                                  the dlm using this ls */
-       int                     ls_create_count; /* create/release refcount */
-       unsigned long           ls_flags;       /* LSFL_ */
-+      unsigned long           ls_scan_time;
-       struct kobject          ls_kobj;
- 
-       struct dlm_rsbtable     *ls_rsbtbl;
-diff --git a/fs/dlm/lockspace.c b/fs/dlm/lockspace.c
-index ba672fe..d910501 100644
---- a/fs/dlm/lockspace.c
-+++ b/fs/dlm/lockspace.c
-@@ -212,19 +212,41 @@ void dlm_lockspace_exit(void)
-       kset_unregister(dlm_kset);
- }
- 
-+static struct dlm_ls *find_ls_to_scan(void)
-+{
-+      struct dlm_ls *ls;
-+
-+      spin_lock(&lslist_lock);
-+      list_for_each_entry(ls, &lslist, ls_list) {
-+              if (time_after_eq(jiffies, ls->ls_scan_time +
-+                                          dlm_config.ci_scan_secs * HZ)) {
-+                      spin_unlock(&lslist_lock);
-+                      return ls;
-+              }
-+      }
-+      spin_unlock(&lslist_lock);
-+      return NULL;
-+}
-+
- static int dlm_scand(void *data)
- {
-       struct dlm_ls *ls;
-+      int timeout_jiffies = dlm_config.ci_scan_secs * HZ;
- 
-       while (!kthread_should_stop()) {
--              list_for_each_entry(ls, &lslist, ls_list) {
-+              ls = find_ls_to_scan();
-+              if (ls) {
-                       if (dlm_lock_recovery_try(ls)) {
-+                              ls->ls_scan_time = jiffies;
-                               dlm_scan_rsbs(ls);
-                               dlm_scan_timeout(ls);
-                               dlm_unlock_recovery(ls);
-+                      } else {
-+                              ls->ls_scan_time += HZ;
-                       }
-+              } else {
-+                      schedule_timeout_interruptible(timeout_jiffies);
-               }
--              schedule_timeout_interruptible(dlm_config.ci_scan_secs * HZ);
-       }
-       return 0;
- }
-@@ -418,6 +440,7 @@ static int new_lockspace(char *name, int namelen, void **lockspace,
-       ls->ls_lvblen = lvblen;
-       ls->ls_count = 0;
-       ls->ls_flags = 0;
-+      ls->ls_scan_time = jiffies;
- 
-       if (flags & DLM_LSFL_TIMEWARN)
-               set_bit(LSFL_TIMEWARN, &ls->ls_flags);