[SSI] openssi/kernel/net/unix af_unix.c,1.6,1.7

Update of /cvsroot/ssic-linux/openssi/kernel/net/unix
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13513/net/unix

Modified Files:
        af_unix.c 
Log Message:
Adapt John's rmtsock changes for the new kiocb structure to rmtunix.


Index: af_unix.c
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/kernel/net/unix/af_unix.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- af_unix.c   8 Nov 2004 23:55:04 -0000       1.6
+++ af_unix.c   9 Nov 2004 00:44:06 -0000       1.7
@@ -1371,7 +1371,6 @@
  *     Send AF_UNIX data.
  */
 
-#warning: have to adapt sendmsg/recvmsg to the new kiocb argument
 static int unix_dgram_sendmsg(struct kiocb *kiocb, struct socket *sock,
                              struct msghdr *msg, size_t len)
 {
@@ -1424,7 +1423,7 @@
                goto out;
        if (err == 1) {
                /* the other socket is remote */
-               err = ssi_unix_dgram_sendmsg(other, sock, msg, len, siocb->scm);
+               err = ssi_unix_dgram_sendmsg(siocb, other, sock, msg, len);
 
                if (!ssi_unix_ismagic(other)) {
                        kfree(other);
@@ -1547,7 +1546,6 @@
 }
 
                
-#warning: have to adapt sendmsg/recvmsg to the new kiocb argument
 static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
                               struct msghdr *msg, size_t len)
 {
@@ -1585,7 +1583,7 @@
                goto pipe_err;
 
        if (ssi_unix_ismagic(other)) {
-               err = ssi_unix_stream_sendmsg(other, sock, msg, len, 
siocb->scm);
+               err = ssi_unix_stream_sendmsg(siocb, other, sock, msg, len);
                goto out_err;
        }
 
@@ -1676,7 +1674,6 @@
        }
 }
 
-#warning: have to adapt sendmsg/recvmsg to the new kiocb argument
 static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
                              struct msghdr *msg, size_t size,
                              int flags)
@@ -1785,7 +1782,6 @@
 
 
 
-#warning: have to adapt sendmsg/recvmsg to the new kiocb argument
 static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                               struct msghdr *msg, size_t size,
                               int flags)



-------------------------------------------------------
This SF.Net email is sponsored by:
Sybase ASE Linux Express Edition - download now for FREE
LinuxWorld Reader's Choice Award Winner for best database on Linux.
http://ads.osdn.com/?ad_id=5588&alloc_id=12065&op=click