next-20160111/aio

[karo-tx-linux.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 29be035f9c65024fcaf4fe483a81702d6877217f..dd5b22a3fc91e54e403aa7829c79d0e45b0ccb0c 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1534,7 +1534,6 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)
 {
        int i;
        unsigned char max_level = 0;
-       int unix_sock_count = 0;
 
        if (too_many_unix_fds(current))
                return -ETOOMANYREFS;
@@ -1542,11 +1541,9 @@ static int unix_attach_fds(struct scm_cookie *scm, struct sk_buff *skb)
        for (i = scm->fp->count - 1; i >= 0; i--) {
                struct sock *sk = unix_get_socket(scm->fp->fp[i]);
 
-               if (sk) {
-                       unix_sock_count++;
+               if (sk)
                        max_level = max(max_level,
                                        unix_sk(sk)->recursion_level);
-               }
        }
        if (unlikely(max_level > MAX_RECURSION_LEVEL))
                return -ETOOMANYREFS;
@@ -1939,7 +1936,7 @@ pipe_err_free:
        kfree_skb(skb);
 pipe_err:
        if (sent == 0 && !(msg->msg_flags&MSG_NOSIGNAL))
-               send_sig(SIGPIPE, current, 0);
+               io_send_sig(SIGPIPE);
        err = -EPIPE;
 out_err:
        scm_destroy(&scm);
@@ -2056,7 +2053,7 @@ err_unlock:
 err:
        kfree_skb(newskb);
        if (send_sigpipe && !(flags & MSG_NOSIGNAL))
-               send_sig(SIGPIPE, current, 0);
+               io_send_sig(SIGPIPE);
        if (!init_scm)
                scm_destroy(&scm);
        return err;