nfsd: nfsd should drop CAP_MKNOD for non-root

[safe/jmp/linux-2.6] / net / dccp / probe.c

diff --git a/net/dccp/probe.c b/net/dccp/probe.c
index 81368a7..37731da 100644 (file)
--- a/net/dccp/probe.c
+++ b/net/dccp/probe.c
@@ -74,30 +74,27 @@ static void printl(const char *fmt, ...)
 static int jdccp_sendmsg(struct kiocb *iocb, struct sock *sk,
                         struct msghdr *msg, size_t size)
 {
-       const struct dccp_minisock *dmsk = dccp_msk(sk);
        const struct inet_sock *inet = inet_sk(sk);
-       const struct ccid3_hc_tx_sock *hctx;
+       struct ccid3_hc_tx_sock *hctx = NULL;
 
-       if (dmsk->dccpms_tx_ccid == DCCPC_CCID3)
+       if (ccid_get_current_tx_ccid(dccp_sk(sk)) == DCCPC_CCID3)
                hctx = ccid3_hc_tx_sk(sk);
-       else
-               hctx = NULL;
 
        if (port == 0 || ntohs(inet->dport) == port ||
            ntohs(inet->sport) == port) {
                if (hctx)
-                       printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d %d %d %d %u "
+                       printl("%pI4:%u %pI4:%u %d %d %d %d %u "
                               "%llu %llu %d\n",
-                              NIPQUAD(inet->saddr), ntohs(inet->sport),
-                              NIPQUAD(inet->daddr), ntohs(inet->dport), size,
+                              &inet->saddr, ntohs(inet->sport),
+                              &inet->daddr, ntohs(inet->dport), size,
                               hctx->ccid3hctx_s, hctx->ccid3hctx_rtt,
                               hctx->ccid3hctx_p, hctx->ccid3hctx_x_calc,
                               hctx->ccid3hctx_x_recv >> 6,
                               hctx->ccid3hctx_x >> 6, hctx->ccid3hctx_t_ipi);
                else
-                       printl("%d.%d.%d.%d:%u %d.%d.%d.%d:%u %d\n",
-                              NIPQUAD(inet->saddr), ntohs(inet->sport),
-                              NIPQUAD(inet->daddr), ntohs(inet->dport), size);
+                       printl("%pI4:%u %pI4:%u %d\n",
+                              &inet->saddr, ntohs(inet->sport),
+                              &inet->daddr, ntohs(inet->dport), size);
        }
 
        jprobe_return();