Re: coda doesn't compile on test8-pre2

[Mohammad A. Haque]

This patch should fix it for coda and smbfs.

On Sun, 3 Sep 2000, Oliver Neukum wrote:

> Hi,
> 
> coda does not compile.
> 
> gcc -D__KERNEL__ -I/home/oliver/linux/include -Wall -Wstrict-prototypes -O2 
>-fomit-frame-pointer -pipe  -mpreferred-stack-boundary=2 -march=i686 
>-malign-functions=4  -fno-strict-aliasing -DMODULE   -c -o upcall.o upcall.c
> upcall.c: In function `coda_waitfor_upcall':
> upcall.c:637: structure has no member named `signal'
> upcall.c:637: structure has no member named `signal'
> upcall.c:638: structure has no member named `signal'
> upcall.c:638: structure has no member named `signal'
> make[2]: *** [upcall.o] Error 1
> make[2]: Leaving directory `/home/oliver/linux/fs/coda'
> make[1]: *** [_modsubdir_coda] Error 2
> make[1]: Leaving directory `/home/oliver/linux/fs'
> make: *** [_mod_fs] Error 2
> 
>       Oliver
> -
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to [EMAIL PROTECTED]
> Please read the FAQ at http://www.tux.org/lkml/
> 

-- 

=====================================================================
Mohammad A. Haque                              http://www.haque.net/ 
                                               [EMAIL PROTECTED]

  "Alcohol and calculus don't mix.             Project Lead
   Don't drink and derive." --Unknown          http://wm.themes.org/
                                               [EMAIL PROTECTED]
=====================================================================

diff -uNrw linux/fs/coda/upcall.c linux-mhaque/fs/coda/upcall.c
--- linux/fs/coda/upcall.c      Wed Jun 28 22:31:36 2000
+++ linux-mhaque/fs/coda/upcall.c       Sun Sep  3 17:07:58 2000
@@ -634,8 +634,8 @@
 
                if ( !coda_hard && vmp->uc_opcode != CODA_CLOSE && 
signal_pending(current) ) {
                        /* if this process really wants to die, let it go */
-                       if ( sigismember(&(current->signal), SIGKILL) ||
-                            sigismember(&(current->signal), SIGINT) )
+                       if ( sigismember(&(current->pending.signal), SIGKILL) ||
+                            sigismember(&(current->pending.signal), SIGINT) )
                                break;
                        /* signal is present: after timeout always return 
                           really smart idea, probably useless ... */
diff -uNrw linux/fs/smbfs/sock.c linux-mhaque/fs/smbfs/sock.c
--- linux/fs/smbfs/sock.c       Sun Sep  3 17:04:04 2000
+++ linux-mhaque/fs/smbfs/sock.c        Sun Sep  3 17:09:10 2000
@@ -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);