diff mbox

[1/5] NFS: Set NFS_CS_MIGRATION for NFSv4 mounts

Message ID 20130625162327.36416.68503.stgit@seurat.1015granger.net (mailing list archive)
State New, archived
Headers show

Commit Message

Chuck Lever June 25, 2013, 4:23 p.m. UTC 
NFS_CS_MIGRATION makes sense only for NFSv4 mounts.  Introduced by
commit 89652617 (NFS: Introduce "migration" mount option) Fri Sep 14
17:24:11 2012.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
 fs/nfs/client.c     |    2 --
 fs/nfs/nfs4client.c |    2 ++
 2 files changed, 2 insertions(+), 2 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Trond Myklebust June 28, 2013, 8:03 p.m. UTC | #1 
On Tue, 2013-06-25 at 12:23 -0400, Chuck Lever wrote:
> NFS_CS_MIGRATION makes sense only for NFSv4 mounts.  Introduced by
> commit 89652617 (NFS: Introduce "migration" mount option) Fri Sep 14
> 17:24:11 2012.
> 
> Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
> ---
>  fs/nfs/client.c     |    2 --
>  fs/nfs/nfs4client.c |    2 ++
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/nfs/client.c b/fs/nfs/client.c
> index c513b0c..dbb65fb 100644
> --- a/fs/nfs/client.c
> +++ b/fs/nfs/client.c
> @@ -753,8 +753,6 @@ static int nfs_init_server(struct nfs_server *server,
>  			data->timeo, data->retrans);
>  	if (data->flags & NFS_MOUNT_NORESVPORT)
>  		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
> -	if (server->options & NFS_OPTION_MIGRATION)
> -		set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
>  
>  	/* Allocate or find a client reference we can use */
>  	clp = nfs_get_client(&cl_init, &timeparms, NULL, RPC_AUTH_UNIX);
> diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
> index 4cbad5d..b7a9f76 100644
> --- a/fs/nfs/nfs4client.c
> +++ b/fs/nfs/nfs4client.c
> @@ -626,6 +626,8 @@ static int nfs4_set_client(struct nfs_server *server,
>  
>  	if (server->flags & NFS_MOUNT_NORESVPORT)
>  		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
> +	if (server->options & NFS_OPTION_MIGRATION)
> +		set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
>  
>  	/* Allocate or find a client reference we can use */
>  	clp = nfs_get_client(&cl_init, timeparms, ip_addr, authflavour);
> 

Applied
diff mbox

Patch

diff --git a/fs/nfs/client.c b/fs/nfs/client.c
index c513b0c..dbb65fb 100644
--- a/fs/nfs/client.c
+++ b/fs/nfs/client.c
@@ -753,8 +753,6 @@  static int nfs_init_server(struct nfs_server *server,
 			data->timeo, data->retrans);
 	if (data->flags & NFS_MOUNT_NORESVPORT)
 		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
-	if (server->options & NFS_OPTION_MIGRATION)
-		set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
 
 	/* Allocate or find a client reference we can use */
 	clp = nfs_get_client(&cl_init, &timeparms, NULL, RPC_AUTH_UNIX);
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c
index 4cbad5d..b7a9f76 100644
--- a/fs/nfs/nfs4client.c
+++ b/fs/nfs/nfs4client.c
@@ -626,6 +626,8 @@  static int nfs4_set_client(struct nfs_server *server,
 
 	if (server->flags & NFS_MOUNT_NORESVPORT)
 		set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags);
+	if (server->options & NFS_OPTION_MIGRATION)
+		set_bit(NFS_CS_MIGRATION, &cl_init.init_flags);
 
 	/* Allocate or find a client reference we can use */
 	clp = nfs_get_client(&cl_init, timeparms, ip_addr, authflavour);