ncp compile probs

Peter T. Waltenberg (peterw@karaka.chch.cri.nz)
Sat, 13 Dec 1997 09:10:50 +1300 (NZDT)

With the following patch applied. It'll compile cleanly, it's been
running with the patch here since 2.1.68 when someone was a bit careless
in updating the code for the new signal semantics.

*** linux/fs/ncpfs/sock.c.orig Mon Dec 1 07:59:02 1997
--- linux/fs/ncpfs/sock.c Mon Dec 1 15:55:34 1997
***************
*** 18,23 ****
--- 18,24 ----
#include <linux/net.h>
#include <linux/mm.h>
#include <linux/netdevice.h>
+ #include <linux/signal.h>
#include <net/scm.h>
#include <net/sock.h>
#include <linux/ipx.h>
***************
*** 124,135 ****
What if we've blocked it ourselves? What about
alarms? Why, in fact, are we mucking with the
sigmask at all? -- r~ */
! if (current->sig->action[SIGINT - 1].sa_handler == SIG_DFL)
mask |= sigmask(SIGINT);
! if (current->sig->action[SIGQUIT - 1].sa_handler == SIG_DFL)
mask |= sigmask(SIGQUIT);
}
! siginitmaskinv(&current->blocked, mask);
recalc_sigpending(current);
spin_unlock_irqrestore(&current->sigmask_lock, flags);

--- 125,136 ----
What if we've blocked it ourselves? What about
alarms? Why, in fact, are we mucking with the
sigmask at all? -- r~ */
! if (current->sig->action[SIGINT - 1].sa.sa_handler == SIG_DFL)
mask |= sigmask(SIGINT);
! if (current->sig->action[SIGQUIT - 1].sa.sa_handler == SIG_DFL)
mask |= sigmask(SIGQUIT);
}
! siginitsetinv(&current->blocked, mask);
recalc_sigpending(current);
spin_unlock_irqrestore(&current->sigmask_lock, flags);

***************
*** 278,284 ****
}

spin_lock_irqsave(&current->sigmask_lock, flags);
! current->blocked = old_mask;
recalc_sigpending(current);
spin_unlock_irqrestore(&current->sigmask_lock, flags);

--- 279,285 ----
}

spin_lock_irqsave(&current->sigmask_lock, flags);
! current->blocked = old_set;
recalc_sigpending(current);
spin_unlock_irqrestore(&current->sigmask_lock, flags);