patch-2.4.0-test8 linux/fs/smbfs/sock.c

• Lines: 36
• Date: Sun Sep 3 11:46:40 2000
• Orig file: v2.4.0-test7/linux/fs/smbfs/sock.c
• Orig date: Wed Aug 23 18:36:38 2000

diff -u --recursive --new-file v2.4.0-test7/linux/fs/smbfs/sock.c linux/fs/smbfs/sock.c
@@ -641,7 +641,7 @@
 	DEBUG1("len = %d cmd = 0x%X\n", len, buffer[8]);
 
 	spin_lock_irqsave(&current->sigmask_lock, flags);
-	sigpipe = sigismember(&current->signal, SIGPIPE);
+	sigpipe = sigismember(&current->pending.signal, SIGPIPE);
 	old_set = current->blocked;
 	siginitsetinv(&current->blocked, sigmask(SIGKILL)|sigmask(SIGSTOP));
 	recalc_sigpending(current);
@@ -659,7 +659,7 @@
 	/* read/write errors are handled by errno */
 	spin_lock_irqsave(&current->sigmask_lock, flags);
 	if (result == -EPIPE && !sigpipe)
-		sigdelset(&current->signal, SIGPIPE);
+		sigdelset(&current->pending.signal, SIGPIPE);
 	current->blocked = old_set;
 	recalc_sigpending(current);
 	spin_unlock_irqrestore(&current->sigmask_lock, flags);
@@ -821,7 +821,7 @@
 		goto bad_conn;
 
 	spin_lock_irqsave(&current->sigmask_lock, flags);
-	sigpipe = sigismember(&current->signal, SIGPIPE);
+	sigpipe = sigismember(&current->pending.signal, SIGPIPE);
 	old_set = current->blocked;
 	siginitsetinv(&current->blocked, sigmask(SIGKILL)|sigmask(SIGSTOP));
 	recalc_sigpending(current);
@@ -841,7 +841,7 @@
 	/* read/write errors are handled by errno */
 	spin_lock_irqsave(&current->sigmask_lock, flags);
 	if (result == -EPIPE && !sigpipe)
-		sigdelset(&current->signal, SIGPIPE);
+		sigdelset(&current->pending.signal, SIGPIPE);
 	current->blocked = old_set;
 	recalc_sigpending(current);
 	spin_unlock_irqrestore(&current->sigmask_lock, flags);