Attachment 159849 Details for Bug 151085 – patch -- backport of patch in description

[patch] patch -- backport of patch in description

linux-2.6.9-nfs-intr-mount.patch (text/plain), 1.54 KB, created by Jeff Layton on 2007-07-24 13:38:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jeff Layton

Created: 2007-07-24 13:38:42 UTC

Size: 1.54 KB

patch

obsolete

>diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
>index 9d4c529..b9c2ed8 100644
>--- a/fs/nfs/inode.c
>+++ b/fs/nfs/inode.c
>@@ -342,6 +342,9 @@ nfs_sb_init(struct super_block *sb, rpc_authflavor_t authflavor)
> 
> 	sb->s_show_stats = nfs_show_stats;
> 
>+	server->client->cl_intr = (server->flags & NFS_MOUNT_INTR) ? 1 : 0;
>+	server->client->cl_softrtry = (server->flags & NFS_MOUNT_SOFT) ? 1 : 0;
>+
> 	/* We're airborne Set socket buffersize */
> 	rpc_setbufsize(server->client, server->wsize + 100, server->rsize + 100);
> 	return 0;
>@@ -392,8 +395,8 @@ nfs_create_client(struct nfs_server *server, const struct nfs_mount_data *data)
> 		goto out_fail;
> 	}
> 
>-	clnt->cl_intr     = (server->flags & NFS_MOUNT_INTR) ? 1 : 0;
>-	clnt->cl_softrtry = (server->flags & NFS_MOUNT_SOFT) ? 1 : 0;
>+	clnt->cl_intr     = 1;
>+	clnt->cl_softrtry = 1;
> 	clnt->cl_droppriv = (server->flags & NFS_MOUNT_BROKEN_SUID) ? 1 : 0;
> 	clnt->cl_chatty   = 1;
> 
>@@ -1868,6 +1871,8 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
> 			err = PTR_ERR(clnt);
> 			goto out_fail;
> 		}
>+		clnt->cl_intr     = 1;
>+		clnt->cl_softrtry = 1;
> 		clnt->cl_chatty   = 1;
> 		clp->cl_rpcclient = clnt;
> 		clp->cl_cred = rpcauth_lookupcred(clnt->cl_auth, 0);
>@@ -1893,8 +1898,6 @@ static int nfs4_fill_super(struct super_block *sb, struct nfs4_mount_data *data,
> 		return PTR_ERR(clnt);
> 	}
> 
>-	clnt->cl_intr     = (server->flags & NFS4_MOUNT_INTR) ? 1 : 0;
>-	clnt->cl_softrtry = (server->flags & NFS4_MOUNT_SOFT) ? 1 : 0;
> 	server->client    = clnt;
> 
> 	if (server->nfs4_state->cl_idmap == NULL) {

Actions: View | Diff

Attachments on bug 151085: 159849 | 159931