1 files changed, 1 insertions, 5 deletions

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index 70587f383f10..310fa2f4cbb8 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -302,7 +302,7 @@ found_client:
         if (new)
                 nfs_free_client(new);
 
-        error = wait_event_interruptible(nfs_client_active_wq,
+        error = wait_event_killable(nfs_client_active_wq,
                                 clp->cl_cons_state != NFS_CS_INITING);
         if (error < 0) {
                 nfs_put_client(clp);
@@ -494,10 +494,6 @@ static int nfs_init_server_rpcclient(struct nfs_server *server, rpc_authflavor_t
         if (server->flags & NFS_MOUNT_SOFT)
                 server->client->cl_softrtry = 1;
 
-        server->client->cl_intr = 0;
-        if (server->flags & NFS4_MOUNT_INTR)
-                server->client->cl_intr = 1;
-
         return 0;
 }