lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

Browse Source
This commit is contained in:
Trond Myklebust
2006-12-07 16:35:17 -05:00
parent 34161db6b1 68380b5813
commit 21b4e73692
1227 changed files with 24634 additions and 14278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
net/sunrpc/xprtsock.c
View File

@@ -1173,6 +1173,35 @@ static int xs_bindresvport(struct sock_xprt *transport, struct socket *sock)
return err;
}
#ifdef CONFIG_DEBUG_LOCK_ALLOC
static struct lock_class_key xs_key[2];
static struct lock_class_key xs_slock_key[2];
static inline void xs_reclassify_socket(struct socket *sock)
{
struct sock *sk = sock->sk;
BUG_ON(sk->sk_lock.owner != NULL);
switch (sk->sk_family) {
case AF_INET:
sock_lock_init_class_and_name(sk, "slock-AF_INET-NFS",
&xs_slock_key[0], "sk_lock-AF_INET-NFS", &xs_key[0]);
break;
case AF_INET6:
sock_lock_init_class_and_name(sk, "slock-AF_INET6-NFS",
&xs_slock_key[1], "sk_lock-AF_INET6-NFS", &xs_key[1]);
break;
default:
BUG();
}
}
#else
static inline void xs_reclassify_socket(struct socket *sock)
{
}
#endif
/**
* xs_udp_connect_worker - set up a UDP socket
* @work: RPC transport to connect
@@ -1197,6 +1226,7 @@ static void xs_udp_connect_worker(struct work_struct *work)
dprintk("RPC: can't create UDP transport socket (%d).\n", -err);
goto out;
}
xs_reclassify_socket(sock);
if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
sock_release(sock);
@@ -1282,6 +1312,7 @@ static void xs_tcp_connect_worker(struct work_struct *work)
dprintk("RPC: can't create TCP transport socket (%d).\n", -err);
goto out;
}
xs_reclassify_socket(sock);
if (xprt->resvport && xs_bindresvport(transport, sock) < 0) {
sock_release(sock);