Merge tag 'nfs-for-3.5-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[firefly-linux-kernel-4.4.55.git] / net / sunrpc / xprt.c

diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index d7ccd7923eab9d9e6e9706d038df345316338ec6..3c83035cdaa9940849fbfb1c729a6a2720b32702 100644 (file)
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -783,7 +783,7 @@ static void xprt_update_rtt(struct rpc_task *task)
 {
        struct rpc_rqst *req = task->tk_rqstp;
        struct rpc_rtt *rtt = task->tk_client->cl_rtt;
-       unsigned timer = task->tk_msg.rpc_proc->p_timer;
+       unsigned int timer = task->tk_msg.rpc_proc->p_timer;
        long m = usecs_to_jiffies(ktime_to_us(req->rq_rtt));
 
        if (timer) {