sunrpc: move rq_usedeferral flag to rq_flags

[cascardo/linux.git] / net / sunrpc / svc_xprt.c

diff --git a/net/sunrpc/svc_xprt.c b/net/sunrpc/svc_xprt.c
index c179ca2..a40f375 100644 (file)
--- a/net/sunrpc/svc_xprt.c
+++ b/net/sunrpc/svc_xprt.c
@@ -15,6 +15,7 @@
 #include <linux/sunrpc/svcsock.h>
 #include <linux/sunrpc/xprt.h>
 #include <linux/module.h>
+#include <trace/events/sunrpc.h>
 
 #define RPCDBG_FACILITY        RPCDBG_SVCXPRT
 
@@ -773,35 +774,46 @@ int svc_recv(struct svc_rqst *rqstp, long timeout)
 
        err = svc_alloc_arg(rqstp);
        if (err)
-               return err;
+               goto out;
 
        try_to_freeze();
        cond_resched();
+       err = -EINTR;
        if (signalled() || kthread_should_stop())
-               return -EINTR;
+               goto out;
 
        xprt = svc_get_next_xprt(rqstp, timeout);
-       if (IS_ERR(xprt))
-               return PTR_ERR(xprt);
+       if (IS_ERR(xprt)) {
+               err = PTR_ERR(xprt);
+               goto out;
+       }
 
        len = svc_handle_xprt(rqstp, xprt);
 
        /* No data, incomplete (TCP) read, or accept() */
+       err = -EAGAIN;
        if (len <= 0)
-               goto out;
+               goto out_release;
 
        clear_bit(XPT_OLD, &xprt->xpt_flags);
 
-       rqstp->rq_secure = xprt->xpt_ops->xpo_secure_port(rqstp);
+       if (xprt->xpt_ops->xpo_secure_port(rqstp))
+               set_bit(RQ_SECURE, &rqstp->rq_flags);
+       else
+               clear_bit(RQ_SECURE, &rqstp->rq_flags);
        rqstp->rq_chandle.defer = svc_defer;
+       rqstp->rq_xid = svc_getu32(&rqstp->rq_arg.head[0]);
 
        if (serv->sv_stats)
                serv->sv_stats->netcnt++;
+       trace_svc_recv(rqstp, len);
        return len;
-out:
+out_release:
        rqstp->rq_res.len = 0;
        svc_xprt_release(rqstp);
-       return -EAGAIN;
+out:
+       trace_svc_recv(rqstp, err);
+       return err;
 }
 EXPORT_SYMBOL_GPL(svc_recv);
 
@@ -821,12 +833,12 @@ EXPORT_SYMBOL_GPL(svc_drop);
 int svc_send(struct svc_rqst *rqstp)
 {
        struct svc_xprt *xprt;
-       int             len;
+       int             len = -EFAULT;
        struct xdr_buf  *xb;
 
        xprt = rqstp->rq_xprt;
        if (!xprt)
-               return -EFAULT;
+               goto out;
 
        /* release the receive skb before sending the reply */
        rqstp->rq_xprt->xpt_ops->xpo_release_rqst(rqstp);
@@ -849,7 +861,9 @@ int svc_send(struct svc_rqst *rqstp)
        svc_xprt_release(rqstp);
 
        if (len == -ECONNREFUSED || len == -ENOTCONN || len == -EAGAIN)
-               return 0;
+               len = 0;
+out:
+       trace_svc_send(rqstp, len);
        return len;
 }
 
@@ -884,7 +898,6 @@ static void svc_age_temp_xprts(unsigned long closure)
                        continue;
                list_del_init(le);
                set_bit(XPT_CLOSE, &xprt->xpt_flags);
-               set_bit(XPT_DETACHED, &xprt->xpt_flags);
                dprintk("queuing xprt %p for closing\n", xprt);
 
                /* a thread will dequeue and close it soon */
@@ -924,8 +937,7 @@ static void svc_delete_xprt(struct svc_xprt *xprt)
        xprt->xpt_ops->xpo_detach(xprt);
 
        spin_lock_bh(&serv->sv_lock);
-       if (!test_and_set_bit(XPT_DETACHED, &xprt->xpt_flags))
-               list_del_init(&xprt->xpt_list);
+       list_del_init(&xprt->xpt_list);
        WARN_ON_ONCE(!list_empty(&xprt->xpt_ready));
        if (test_bit(XPT_TEMP, &xprt->xpt_flags))
                serv->sv_tmpcnt--;
@@ -1069,7 +1081,7 @@ static struct cache_deferred_req *svc_defer(struct cache_req *req)
        struct svc_rqst *rqstp = container_of(req, struct svc_rqst, rq_chandle);
        struct svc_deferred_req *dr;
 
-       if (rqstp->rq_arg.page_len || !rqstp->rq_usedeferral)
+       if (rqstp->rq_arg.page_len || !test_bit(RQ_USEDEFERRAL, &rqstp->rq_flags))
                return NULL; /* if more than a page, give up FIXME */
        if (rqstp->rq_deferred) {
                dr = rqstp->rq_deferred;