Merge with 2.3.47. Guys, this is buggy as shit. You've been warned.

1 files changed, 0 insertions, 6 deletions

diff --git a/net/sunrpc/svcsock.c b/net/sunrpc/svcsock.c
index 131f37f46..d63024983 100644
--- a/net/sunrpc/svcsock.c
+++ b/net/sunrpc/svcsock.c
@@ -64,7 +64,6 @@ static int		svc_udp_sendto(struct svc_rqst *);
 static inline void
 svc_serv_enqueue(struct svc_serv *serv, struct svc_rqst *rqstp)
 {
-	BUG_TRAP(spin_is_locked(&serv->sv_lock));
 	rpc_append_list(&serv->sv_threads, rqstp);
 }
 
@@ -74,7 +73,6 @@ svc_serv_enqueue(struct svc_serv *serv, struct svc_rqst *rqstp)
 static inline void
 svc_serv_dequeue(struct svc_serv *serv, struct svc_rqst *rqstp)
 {
-	BUG_TRAP(spin_is_locked(&serv->sv_lock));
 	rpc_remove_list(&serv->sv_threads, rqstp);
 }
 
@@ -106,8 +104,6 @@ svc_sock_enqueue(struct svc_sock *svsk)
 	struct svc_serv	*serv = svsk->sk_server;
 	struct svc_rqst	*rqstp;
 
-	BUG_TRAP(spin_is_locked(&svsk->sk_lock));
-
 	/* NOTE: Local BH is already disabled by our caller. */
 	spin_lock(&serv->sv_lock);
 
@@ -156,8 +152,6 @@ svc_sock_dequeue(struct svc_serv *serv)
 {
 	struct svc_sock	*svsk;
 
-	BUG_TRAP(spin_is_locked(&serv->sv_lock));
-
 	if ((svsk = serv->sv_sockets) != NULL)
 		rpc_remove_list(&serv->sv_sockets, svsk);