Commit 0f5f49b8 authored by Weston Andros Adamson's avatar Weston Andros Adamson Committed by Trond Myklebust
Browse files

NFS: cache parsed auth_info in nfs_server 



Cache the auth_info structure in nfs_server and pass these values to submounts.

This lays the groundwork for supporting multiple sec= options.

Signed-off-by: default avatarWeston Andros Adamson <dros@netapp.com>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent a3f73c27

fs/nfs/client.c

+2 −0
Original line number Diff line number Diff line
@@ -786,6 +786,7 @@ static int nfs_init_server(struct nfs_server *server, 
		goto error;



	server->port = data->nfs_server.port;

	server->auth_info = data->auth_info;



	error = nfs_init_server_rpcclient(server, &timeparms,

					  data->selected_flavor);
@@ -929,6 +930,7 @@ void nfs_server_copy_userdata(struct nfs_server *target, struct nfs_server *sour 
	target->acdirmax = source->acdirmax;

	target->caps = source->caps;

	target->options = source->options;

	target->auth_info = source->auth_info;

}

EXPORT_SYMBOL_GPL(nfs_server_copy_userdata);

fs/nfs/nfs4client.c

+1 −0
Original line number Diff line number Diff line
@@ -962,6 +962,7 @@ static int nfs4_init_server(struct nfs_server *server, 
	/* Initialise the client representation from the mount data */

	server->flags = data->flags;

	server->options = data->options;

	server->auth_info = data->auth_info;



	if (data->auth_info.flavor_len >= 1)

		data->selected_flavor = data->auth_info.flavors[0];

fs/nfs/super.c

+1 −2
Original line number Diff line number Diff line
@@ -2187,8 +2187,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) 
	data->wsize = nfss->wsize;

	data->retrans = nfss->client->cl_timeout->to_retries;

	data->selected_flavor = nfss->client->cl_auth->au_flavor;

	data->auth_info.flavors[0] = nfss->client->cl_auth->au_flavor;

	data->auth_info.flavor_len = 1;

	data->auth_info = nfss->auth_info;

	data->acregmin = nfss->acregmin / HZ;

	data->acregmax = nfss->acregmax / HZ;

	data->acdirmin = nfss->acdirmin / HZ;

include/linux/nfs_fs_sb.h

+1 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ struct nfs_server { 
	unsigned long		mount_time;	/* when this fs was mounted */

	struct super_block	*super;		/* VFS super block */

	dev_t			s_dev;		/* superblock dev numbers */

	struct nfs_auth_info	auth_info;	/* parsed auth flavors */



#ifdef CONFIG_NFS_FSCACHE

	struct nfs_fscache_key	*fscache_key;	/* unique key for superblock */