- update

Changed files:
    linux-cluster-cman.patch -> 1.6
    linux-cluster-dlm.patch -> 1.8
    linux-cluster-gfs.patch -> 1.7

diff --git a/linux-cluster-cman.patch b/linux-cluster-cman.patch
index 1eff0aa214e76df44a00e8fe1a8f1823eee05195..996c1bb58a1e950dbff1740103fdad27b773c53e 100644 (file)
--- a/linux-cluster-cman.patch
+++ b/linux-cluster-cman.patch
@@ -65,12 +65,15 @@ diff -urN linux-orig/arch/m68k/Kconfig linux-orig2/arch/m68k/Kconfig
 diff -urN linux-orig/arch/mips/Kconfig linux-orig2/arch/mips/Kconfig
 --- linux-orig/arch/mips/Kconfig       2004-10-18 16:54:08.000000000 -0500
 +++ linux-orig2/arch/mips/Kconfig      2004-10-22 11:29:33.541218184 -0500
-@@ -1563,3 +1563,5 @@
- source "crypto/Kconfig"
+@@ -1587,6 +1587,8 @@
  
  source "lib/Kconfig"
-+
+ 
 +source "cluster/Kconfig"
++
+ #
+ # Use the generic interrupt handling code in kernel/irq/:
+ #
 diff -urN linux-orig/arch/parisc/Kconfig linux-orig2/arch/parisc/Kconfig
 --- linux-orig/arch/parisc/Kconfig     2004-10-18 16:54:37.000000000 -0500
 +++ linux-orig2/arch/parisc/Kconfig    2004-10-22 11:31:57.146964867 -0500
@@ -9408,7 +9411,7 @@ diff -urN linux-orig/cluster/cman/sm_daemon.c linux-patched/cluster/cman/sm_daem
 +{
 +      struct task_struct *p;
 +
-+      p = kthread_run(serviced, NULL, "cman_serviced");
++      p = kthread_run(serviced, NULL, 0, "cman_serviced");
 +      if (IS_ERR(p)) {
 +              printk("can't start cman_serviced daemon");
 +              return (IS_ERR(p));

diff --git a/linux-cluster-dlm.patch b/linux-cluster-dlm.patch
index 30b8a7bab97ade2f75c6a33d319475be36a0d4f4..0682fd1974a81737f76292158b895673ee9025fc 100644 (file)
--- a/linux-cluster-dlm.patch
+++ b/linux-cluster-dlm.patch
@@ -669,7 +669,7 @@ diff -urN linux-orig/cluster/dlm/ast.c linux-patched/cluster/dlm/ast.c
 +      init_MUTEX(&ast_queue_lock);
 +      init_waitqueue_head(&astd_waitchan);
 +
-+      p = kthread_run(dlm_astd, NULL, "dlm_astd");
++      p = kthread_run(dlm_astd, NULL, 0, "dlm_astd");
 +      if (IS_ERR(p))
 +              error = PTR_ERR(p);
 +      else
@@ -7997,7 +7997,7 @@ diff -urN linux-orig/cluster/dlm/lowcomms.c linux-patched/cluster/dlm/lowcomms.c
 +      struct task_struct *p;
 +      int error;
 +
-+      p = kthread_run(dlm_recvd, NULL, "dlm_recvd");
++      p = kthread_run(dlm_recvd, NULL, 0, "dlm_recvd");
 +      error = IS_ERR(p);
 +              if (error) {
 +              log_print("can't start dlm_recvd %d", error);
@@ -8005,7 +8005,7 @@ diff -urN linux-orig/cluster/dlm/lowcomms.c linux-patched/cluster/dlm/lowcomms.c
 +      }
 +      recv_task = p;
 +
-+      p = kthread_run(dlm_sendd, NULL, "dlm_sendd");
++      p = kthread_run(dlm_sendd, NULL, 0, "dlm_sendd");
 +      error = IS_ERR(p);
 +              if (error) {
 +              log_print("can't start dlm_sendd %d", error);
@@ -13979,7 +13979,7 @@ diff -urN linux-orig/cluster/dlm/recoverd.c linux-patched/cluster/dlm/recoverd.c
 +        set_bit(LSFL_WORK, &ls->ls_flags);
 +
 +      if (!ls->ls_recoverd_task) {
-+              p = kthread_run(dlm_recoverd, (void *) ls, "dlm_recoverd");
++              p = kthread_run(dlm_recoverd, (void *) ls, 0, "dlm_recoverd");
 +              if (IS_ERR(p)) {
 +                      log_error(ls, "can't start dlm_recoverd %ld",
 +                                PTR_ERR(p));

diff --git a/linux-cluster-gfs.patch b/linux-cluster-gfs.patch
index 26ee18920fede5fb8d6d535edc410bf00922741f..4a4ab9657dbbbb2bae4dd233303dcf074ed93906 100644 (file)
--- a/linux-cluster-gfs.patch
+++ b/linux-cluster-gfs.patch
@@ -28456,7 +28456,7 @@ diff -urN linux-orig/fs/gfs/quota.c linux-patched/fs/gfs/quota.c
 +      if (current->signal) {
 +              tty = current->signal->tty;
 +              if (tty && tty->driver->write)
-+                      tty->driver->write(tty, 0, line, len);
++                      tty->driver->write(tty, line, len);
 +      }
 +
 +      kfree(line);
@@ -40235,7 +40235,7 @@ diff -urN linux-orig/fs/gfs_locking/lock_dlm/thread.c linux-patched/fs/gfs_locki
 +      struct task_struct *p;
 +      int error;
 +
-+      p = kthread_run(dlm_async, dlm, "lock_dlm1");
++      p = kthread_run(dlm_async, dlm, 0, "lock_dlm1");
 +      error = IS_ERR(p);
 +      if (error) {
 +              log_all("can't start lock_dlm1 daemon %d", error);
@@ -40243,7 +40243,7 @@ diff -urN linux-orig/fs/gfs_locking/lock_dlm/thread.c linux-patched/fs/gfs_locki
 +      }
 +      dlm->thread1 = p;
 +
-+      p = kthread_run(dlm_async, dlm, "lock_dlm2");
++      p = kthread_run(dlm_async, dlm, 0, "lock_dlm2");
 +      error = IS_ERR(p);
 +      if (error) {
 +              log_all("can't start lock_dlm2 daemon %d", error);