1 files changed, 13 insertions, 7 deletions

diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index 1aca51e45092..bd938f06481d 100644
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -268,20 +268,16 @@ static inline int check_drop(struct gdlm_ls *ls)
         return 0;
 }
 
-static int gdlm_thread(void *data)
+static int gdlm_thread(void *data, int blist)
 {
         struct gdlm_ls *ls = (struct gdlm_ls *) data;
         struct gdlm_lock *lp = NULL;
-        int blist = 0;
         uint8_t complete, blocking, submit, drop;
         DECLARE_WAITQUEUE(wait, current);
 
         /* Only thread1 is allowed to do blocking callbacks since gfs
            may wait for a completion callback within a blocking cb. */
 
-        if (current == ls->thread1)
-                blist = 1;
-
         while (!kthread_should_stop()) {
                 set_current_state(TASK_INTERRUPTIBLE);
                 add_wait_queue(&ls->thread_wait, &wait);
@@ -333,12 +329,22 @@ static int gdlm_thread(void *data)
         return 0;
 }
 
+static int gdlm_thread1(void *data)
+{
+        return gdlm_thread(data, 1);
+}
+
+static int gdlm_thread2(void *data)
+{
+        return gdlm_thread(data, 0);
+}
+
 int gdlm_init_threads(struct gdlm_ls *ls)
 {
         struct task_struct *p;
         int error;
 
-        p = kthread_run(gdlm_thread, ls, "lock_dlm1");
+        p = kthread_run(gdlm_thread1, ls, "lock_dlm1");
         error = IS_ERR(p);
         if (error) {
                 log_error("can't start lock_dlm1 thread %d", error);
@@ -346,7 +352,7 @@ int gdlm_init_threads(struct gdlm_ls *ls)
         }
         ls->thread1 = p;
 
-        p = kthread_run(gdlm_thread, ls, "lock_dlm2");
+        p = kthread_run(gdlm_thread2, ls, "lock_dlm2");
         error = IS_ERR(p);
         if (error) {
                 log_error("can't start lock_dlm2 thread %d", error);