[dm-devel] Re: 2.4 kernel patches: dm-daemon.c & spin_lock_irq

[Brian <brian@xxxxxxxxxxxxxxxxxxxx>]

Sorry, I don't think that patch will come through.  Here it is again:

--- linux-2.4.21/drivers/md/dm-daemon.c Thu Apr 1 13:15:460 2004
+++ linux/drivers/md/dm-daemon.c      Mon Apr 5 12:44:40 2004
@@ -19,10 +19,10 @@
        reparent_to_init();

        /* block all signals */
-       spin_lock_irq(&current->sigmask_lock);
+       spin_lock_irq(&current->sighand->siglock);
        sigfillset(&current->blocked);
        flush_signals(current);
-       spin_unlock_irq(&current->sigmask_lock);
+       spin_unlock_irq(&current->sighand->siglock);

        strcpy(current->comm, dd->name);
        atomic_set(&dd->please_die, 0);
--- linux-2.4.21/drivers/md/dm-io.c     Thu Apr 1 13:15:46 2004
+++ linux/drivers/md/dm-io.c  Mon Apr 5 13:00:33 2004
@@ -178,10 +178,12 @@
 /*
  * Primitives for alignment calculations.
  */
+#ifndef fls(x)
 int fls(unsigned n)
 {
        return generic_fls32(n);
 }
+#endif

 static inline int log2_floor(unsigned n)
 {