Merge branch 'nfs-for-2.6.39' into nfs-for-next

This commit is contained in:
Trond Myklebust
2011-03-24 17:03:14 -04:00
21 changed files with 1245 additions and 201 deletions

View File

@@ -710,6 +710,8 @@ static void xs_reset_transport(struct sock_xprt *transport)
if (sk == NULL)
return;
transport->srcport = 0;
write_lock_bh(&sk->sk_callback_lock);
transport->inet = NULL;
transport->sock = NULL;