diff --git a/[refs] b/[refs] index d245d2a971e5..0e0822ce9051 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 61ce7b3ab55e6dd3a9811d0cf4f2dc5a3a5d892a +refs/heads/master: 832504933757ba7913bf64cd574326e014215b41 diff --git a/trunk/fs/nfs/client.c b/trunk/fs/nfs/client.c index 013cdbc3b000..34c3996bd0f5 100644 --- a/trunk/fs/nfs/client.c +++ b/trunk/fs/nfs/client.c @@ -322,7 +322,7 @@ static struct nfs_client *nfs_get_client(const char *hostname, if (new) nfs_free_client(new); - error = wait_event_interruptible(&nfs_client_active_wq, + error = wait_event_interruptible(nfs_client_active_wq, clp->cl_cons_state != NFS_CS_INITING); if (error < 0) { nfs_put_client(clp);