diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 13:44:51 -0500 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-20 13:44:51 -0500 |
commit | 43ac3f2961b8616da26114ec6dc76ac2a61f76ad (patch) | |
tree | 461fc961f6c7d9a724425654523cf61cb6c2e485 /net/sunrpc/xprt.c | |
parent | c42de9dd67250fe984e0e31c9b542d721af6454b (diff) |
SUNRPC: Fix memory barriers for req->rq_received
We need to ensure that all writes to the XDR buffers are done before
req->rq_received is visible to other processors.
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprt.c')
-rw-r--r-- | net/sunrpc/xprt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 940dba965bb9..4dd5b3cfe754 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c | |||
@@ -651,6 +651,8 @@ void xprt_complete_rqst(struct rpc_task *task, int copied) | |||
651 | task->tk_rtt = (long)jiffies - req->rq_xtime; | 651 | task->tk_rtt = (long)jiffies - req->rq_xtime; |
652 | 652 | ||
653 | list_del_init(&req->rq_list); | 653 | list_del_init(&req->rq_list); |
654 | /* Ensure all writes are done before we update req->rq_received */ | ||
655 | smp_wmb(); | ||
654 | req->rq_received = req->rq_private_buf.len = copied; | 656 | req->rq_received = req->rq_private_buf.len = copied; |
655 | rpc_wake_up_task(task); | 657 | rpc_wake_up_task(task); |
656 | } | 658 | } |
@@ -727,7 +729,6 @@ void xprt_transmit(struct rpc_task *task) | |||
727 | 729 | ||
728 | dprintk("RPC: %4d xprt_transmit(%u)\n", task->tk_pid, req->rq_slen); | 730 | dprintk("RPC: %4d xprt_transmit(%u)\n", task->tk_pid, req->rq_slen); |
729 | 731 | ||
730 | smp_rmb(); | ||
731 | if (!req->rq_received) { | 732 | if (!req->rq_received) { |
732 | if (list_empty(&req->rq_list)) { | 733 | if (list_empty(&req->rq_list)) { |
733 | spin_lock_bh(&xprt->transport_lock); | 734 | spin_lock_bh(&xprt->transport_lock); |