Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

2 files changed, 22 insertions, 19 deletions

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index c323cc6a28b0..d901465ce013 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -566,7 +566,7 @@ static struct sock * unix_create1(struct socket *sock)
         u->mnt    = NULL;
         spin_lock_init(&u->lock);
         atomic_set(&u->inflight, sock ? 0 : -1);
-        init_MUTEX(&u->readsem); /* single task reading lock */
+        mutex_init(&u->readlock); /* single task reading lock */
         init_waitqueue_head(&u->peer_wait);
         unix_insert_socket(unix_sockets_unbound, sk);
 out:
@@ -623,7 +623,7 @@ static int unix_autobind(struct socket *sock)
         struct unix_address * addr;
         int err;
 
-        down(&u->readsem);
+        mutex_lock(&u->readlock);
 
         err = 0;
         if (u->addr)
@@ -661,7 +661,7 @@ retry:
         spin_unlock(&unix_table_lock);
         err = 0;
 
-out:    up(&u->readsem);
+out:    mutex_unlock(&u->readlock);
         return err;
 }
 
@@ -744,7 +744,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
                 goto out;
         addr_len = err;
 
-        down(&u->readsem);
+        mutex_lock(&u->readlock);
 
         err = -EINVAL;
         if (u->addr)
@@ -816,7 +816,7 @@ static int unix_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len)
 out_unlock:
         spin_unlock(&unix_table_lock);
 out_up:
-        up(&u->readsem);
+        mutex_unlock(&u->readlock);
 out:
         return err;
 
@@ -1427,15 +1427,15 @@ static int unix_stream_sendmsg(struct kiocb *kiocb, struct socket *sock,
         while(sent < len)
         {
                 /*
-                 *      Optimisation for the fact that under 0.01% of X messages typically
-                 *      need breaking up.
+                 *      Optimisation for the fact that under 0.01% of X
+                 *      messages typically need breaking up.
                  */
 
-                size=len-sent;
+                size = len-sent;
 
                 /* Keep two messages in the pipe so it schedules better */
-                if (size > sk->sk_sndbuf / 2 - 64)
-                        size = sk->sk_sndbuf / 2 - 64;
+                if (size > ((sk->sk_sndbuf >> 1) - 64))
+                        size = (sk->sk_sndbuf >> 1) - 64;
 
                 if (size > SKB_MAX_ALLOC)
                         size = SKB_MAX_ALLOC;
@@ -1545,7 +1545,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
 
         msg->msg_namelen = 0;
 
-        down(&u->readsem);
+        mutex_lock(&u->readlock);
 
         skb = skb_recv_datagram(sk, flags, noblock, &err);
         if (!skb)
@@ -1600,7 +1600,7 @@ static int unix_dgram_recvmsg(struct kiocb *iocb, struct socket *sock,
 out_free:
         skb_free_datagram(sk,skb);
 out_unlock:
-        up(&u->readsem);
+        mutex_unlock(&u->readlock);
 out:
         return err;
 }
@@ -1676,7 +1676,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 memset(&tmp_scm, 0, sizeof(tmp_scm));
         }
 
-        down(&u->readsem);
+        mutex_lock(&u->readlock);
 
         do
         {
@@ -1700,7 +1700,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                         err = -EAGAIN;
                         if (!timeo)
                                 break;
-                        up(&u->readsem);
+                        mutex_unlock(&u->readlock);
 
                         timeo = unix_stream_data_wait(sk, timeo);
 
@@ -1708,7 +1708,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                                 err = sock_intr_errno(timeo);
                                 goto out;
                         }
-                        down(&u->readsem);
+                        mutex_lock(&u->readlock);
                         continue;
                 }
 
@@ -1774,7 +1774,7 @@ static int unix_stream_recvmsg(struct kiocb *iocb, struct socket *sock,
                 }
         } while (size);
 
-        up(&u->readsem);
+        mutex_unlock(&u->readlock);
         scm_recv(sock, msg, siocb->scm, flags);
 out:
         return copied ? : err;
@@ -1878,6 +1878,8 @@ static unsigned int unix_poll(struct file * file, struct socket *sock, poll_tabl
                 mask |= POLLERR;
         if (sk->sk_shutdown == SHUTDOWN_MASK)
                 mask |= POLLHUP;
+        if (sk->sk_shutdown & RCV_SHUTDOWN)
+                mask |= POLLRDHUP;
 
         /* readable? */
         if (!skb_queue_empty(&sk->sk_receive_queue) ||
diff --git a/net/unix/garbage.c b/net/unix/garbage.c
index 411802bd4d37..746c2f4a5fa6 100644
--- a/net/unix/garbage.c
+++ b/net/unix/garbage.c
@@ -76,6 +76,7 @@
 #include <linux/netdevice.h>
 #include <linux/file.h>
 #include <linux/proc_fs.h>
+#include <linux/mutex.h>
 
 #include <net/sock.h>
 #include <net/af_unix.h>
@@ -169,7 +170,7 @@ static void maybe_unmark_and_push(struct sock *x)
 
 void unix_gc(void)
 {
-        static DECLARE_MUTEX(unix_gc_sem);
+        static DEFINE_MUTEX(unix_gc_sem);
         int i;
         struct sock *s;
         struct sk_buff_head hitlist;
@@ -179,7 +180,7 @@ void unix_gc(void)
          *      Avoid a recursive GC.
          */
 
-        if (down_trylock(&unix_gc_sem))
+        if (!mutex_trylock(&unix_gc_sem))
                 return;
 
         spin_lock(&unix_table_lock);
@@ -308,5 +309,5 @@ void unix_gc(void)
          */
 
         __skb_queue_purge(&hitlist);
-        up(&unix_gc_sem);
+        mutex_unlock(&unix_gc_sem);
 }