Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f112bb48 authored by Chuck Lever's avatar Chuck Lever Committed by Trond Myklebust
Browse files

NFS: Set NFS_CS_MIGRATION for NFSv4 mounts 



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: default avatarChuck Lever <chuck.lever@oracle.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 18aad3d5

fs/nfs/client.c

+0 −2
Original line number Diff line number Diff line
@@ -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);

fs/nfs/nfs4client.c

+2 −0
Original line number Diff line number Diff line
@@ -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);