NFS: Set NFS_CS_MIGRATION for NFSv4 mounts

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

authored by

Chuck Lever and committed by

Trond Myklebust 12 years ago f112bb48 18aad3d5

+2 -2

2 changed files

expand all

nfs

client.c

nfs4client.c

-2

fs/nfs/client.c

··· 753 753 data->timeo, data->retrans); 754 754 if (data->flags & NFS_MOUNT_NORESVPORT) 755 755 set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); 756 - if (server->options & NFS_OPTION_MIGRATION) 757 - set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); 758 756 759 757 /* Allocate or find a client reference we can use */ 760 758 clp = nfs_get_client(&cl_init, &timeparms, NULL, RPC_AUTH_UNIX);

fs/nfs/nfs4client.c

··· 626 626 627 627 if (server->flags & NFS_MOUNT_NORESVPORT) 628 628 set_bit(NFS_CS_NORESVPORT, &cl_init.init_flags); 629 + if (server->options & NFS_OPTION_MIGRATION) 630 + set_bit(NFS_CS_MIGRATION, &cl_init.init_flags); 629 631 630 632 /* Allocate or find a client reference we can use */ 631 633 clp = nfs_get_client(&cl_init, timeparms, ip_addr, authflavour);