Merge branch 'nfs-for-2.6.33'

This commit is contained in:
Trond Myklebust
2009-12-13 13:56:27 -05:00
30 changed files with 1081 additions and 472 deletions

View File

@@ -2019,7 +2019,7 @@ static void xs_connect(struct rpc_task *task)
if (xprt_test_and_set_connecting(xprt))
return;
if (transport->sock != NULL) {
if (transport->sock != NULL && !RPC_IS_SOFTCONN(task)) {
dprintk("RPC: xs_connect delayed xprt %p for %lu "
"seconds\n",
xprt, xprt->reestablish_timeout / HZ);