aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/sunrpc/xprt.h2
-rw-r--r--net/sunrpc/xprt.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/include/linux/sunrpc/xprt.h b/include/linux/sunrpc/xprt.h
index c4f903f0e17c..41ce296dded1 100644
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
@@ -199,7 +199,7 @@ struct rpc_xprt {
199 * Send stuff 199 * Send stuff
200 */ 200 */
201 spinlock_t transport_lock; /* lock transport info */ 201 spinlock_t transport_lock; /* lock transport info */
202 spinlock_t xprt_lock; /* lock xprt info */ 202 spinlock_t reserve_lock; /* lock slot table */
203 struct rpc_task * snd_task; /* Task blocked in send */ 203 struct rpc_task * snd_task; /* Task blocked in send */
204 204
205 struct list_head recv; 205 struct list_head recv;
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c
index 1f0da8c1a3b0..9c45c522e3ef 100644
--- a/net/sunrpc/xprt.c
+++ b/net/sunrpc/xprt.c
@@ -643,9 +643,9 @@ void xprt_reserve(struct rpc_task *task)
643 643
644 task->tk_status = -EIO; 644 task->tk_status = -EIO;
645 if (!xprt->shutdown) { 645 if (!xprt->shutdown) {
646 spin_lock(&xprt->xprt_lock); 646 spin_lock(&xprt->reserve_lock);
647 do_xprt_reserve(task); 647 do_xprt_reserve(task);
648 spin_unlock(&xprt->xprt_lock); 648 spin_unlock(&xprt->reserve_lock);
649 } 649 }
650} 650}
651 651
@@ -698,10 +698,10 @@ void xprt_release(struct rpc_task *task)
698 698
699 dprintk("RPC: %4d release request %p\n", task->tk_pid, req); 699 dprintk("RPC: %4d release request %p\n", task->tk_pid, req);
700 700
701 spin_lock(&xprt->xprt_lock); 701 spin_lock(&xprt->reserve_lock);
702 list_add(&req->rq_list, &xprt->free); 702 list_add(&req->rq_list, &xprt->free);
703 xprt_clear_backlog(xprt); 703 xprt_clear_backlog(xprt);
704 spin_unlock(&xprt->xprt_lock); 704 spin_unlock(&xprt->reserve_lock);
705} 705}
706 706
707/** 707/**
@@ -751,7 +751,7 @@ static struct rpc_xprt *xprt_setup(int proto, struct sockaddr_in *ap, struct rpc
751 } 751 }
752 752
753 spin_lock_init(&xprt->transport_lock); 753 spin_lock_init(&xprt->transport_lock);
754 spin_lock_init(&xprt->xprt_lock); 754 spin_lock_init(&xprt->reserve_lock);
755 init_waitqueue_head(&xprt->cong_wait); 755 init_waitqueue_head(&xprt->cong_wait);
756 756
757 INIT_LIST_HEAD(&xprt->free); 757 INIT_LIST_HEAD(&xprt->free);