RE: 2.1.68: ncpfs won't compile

[Peter T. Waltenberg]

This message is in MIME format
--_=XFMail.1.2.p0.Linux:971202115713:172=_
Content-Type: text/plain; charset=us-ascii

Patch attached.

It even ran :) before my courage ran out and I rebooted.

Peter
----------------------------------
E-Mail: [e-mail]
Date: 02-Dec-97
Time: 11:56:07
----------------------------------

--_=XFMail.1.2.p0.Linux:971202115713:172=_
Content-Disposition: attachment; filename="ncpfs-2.1.68.pat"
Content-Transfer-Encoding: none
Content-Description: ncpfs-2.1.68.pat
Content-Type: application/octet-stream; name=ncpfs-2.1.68.pat; SizeOnDisk=1753

*** 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);
  	

--_=XFMail.1.2.p0.Linux:971202115713:172=_--
End of MIME message