Commit 8a6e5deb authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Get rid of the NFS_MOUNT_VER3 and NFS_MOUNT_TCP flags 



Keep it in the case of the legacy binary mount interface, but purge it from
the nfs_server structure.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 70430786

fs/nfs/client.c

+9 −3
Original line number Diff line number Diff line
@@ -648,8 +648,6 @@ static int nfs_start_lockd(struct nfs_server *server) 
		.hostname	= clp->cl_hostname,

		.address	= (struct sockaddr *)&clp->cl_addr,

		.addrlen	= clp->cl_addrlen,

		.protocol	= server->flags & NFS_MOUNT_TCP ?

						IPPROTO_TCP : IPPROTO_UDP,

		.nfs_version	= clp->rpc_ops->version,

		.noresvport	= server->flags & NFS_MOUNT_NORESVPORT ?

					1 : 0,
@@ -660,6 +658,14 @@ static int nfs_start_lockd(struct nfs_server *server) 
	if (server->flags & NFS_MOUNT_NONLM)

		return 0;



	switch (clp->cl_proto) {

		default:

			nlm_init.protocol = IPPROTO_TCP;

			break;

		case XPRT_TRANSPORT_UDP:

			nlm_init.protocol = IPPROTO_UDP;

	}



	host = nlmclnt_init(&nlm_init);

	if (IS_ERR(host))

		return PTR_ERR(host);
@@ -787,7 +793,7 @@ static int nfs_init_server(struct nfs_server *server, 
	dprintk("--> nfs_init_server()\n");



#ifdef CONFIG_NFS_V3

	if (data->flags & NFS_MOUNT_VER3)

	if (data->version == 3)

		cl_init.rpc_ops = &nfs_v3_clientops;

#endif

fs/nfs/super.c

+10 −7
Original line number Diff line number Diff line
@@ -1430,11 +1430,14 @@ static int nfs_try_mount(struct nfs_parsed_mount_data *args, 
	int status;



	if (args->mount_server.version == 0) {

		if (args->flags & NFS_MOUNT_VER3)

		switch (args->version) {

			default:

				args->mount_server.version = NFS_MNT3_VERSION;

		else

				break;

			case 2:

				args->mount_server.version = NFS_MNT_VERSION;

		}

	}

	request.version = args->mount_server.version;



	if (args->mount_server.hostname)
@@ -1778,7 +1781,7 @@ static int nfs_validate_mount_data(void *options, 
	}



#ifndef CONFIG_NFS_V3

	if (args->flags & NFS_MOUNT_VER3)

	if (args->version == 3)

		goto out_v3_not_compiled;

#endif /* !CONFIG_NFS_V3 */
@@ -1936,7 +1939,7 @@ static void nfs_fill_super(struct super_block *sb, 
	if (data->bsize)

		sb->s_blocksize = nfs_block_size(data->bsize, &sb->s_blocksize_bits);



	if (server->flags & NFS_MOUNT_VER3) {

	if (server->nfs_client->rpc_ops->version == 3) {

		/* The VFS shouldn't apply the umask to mode bits. We will do

		 * so ourselves when necessary.

		 */
@@ -1960,7 +1963,7 @@ static void nfs_clone_super(struct super_block *sb, 
	sb->s_blocksize = old_sb->s_blocksize;

	sb->s_maxbytes = old_sb->s_maxbytes;



	if (server->flags & NFS_MOUNT_VER3) {

	if (server->nfs_client->rpc_ops->version == 3) {

		/* The VFS shouldn't apply the umask to mode bits. We will do

		 * so ourselves when necessary.

		 */