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

Commit 39c6daae authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Prepare for minorversion-specific nfs_server capabilities 



Clean up the setting of the nfs_server->caps, by shoving it all
into nfs4_server_common_setup().
Then add an 'initial capabilities' field into struct nfs4_minor_version_ops.

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

fs/nfs/nfs4_fs.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ enum nfs4_client_state { 


struct nfs4_minor_version_ops {

	u32	minor_version;

	unsigned init_caps;



	int	(*call_sync)(struct rpc_clnt *clnt,

			struct nfs_server *server,

fs/nfs/nfs4client.c

+13 −11
Original line number Diff line number Diff line
@@ -717,6 +717,19 @@ static int nfs4_server_common_setup(struct nfs_server *server, 
	if (error < 0)

		goto out;



	/* Set the basic capabilities */

	server->caps |= server->nfs_client->cl_mvops->init_caps;

	if (server->flags & NFS_MOUNT_NORDIRPLUS)

			server->caps &= ~NFS_CAP_READDIRPLUS;

	/*

	 * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower

	 * authentication.

	 */

	if (nfs4_disable_idmapping &&

			server->client->cl_auth->au_flavor == RPC_AUTH_UNIX)

		server->caps |= NFS_CAP_UIDGID_NOMAP;





	/* Probe the root fh to retrieve its FSID and filehandle */

	error = nfs4_get_rootfh(server, mntfh);

	if (error < 0)
@@ -760,9 +773,6 @@ static int nfs4_init_server(struct nfs_server *server, 


	/* Initialise the client representation from the mount data */

	server->flags = data->flags;

	server->caps |= NFS_CAP_ATOMIC_OPEN|NFS_CAP_CHANGE_ATTR|NFS_CAP_POSIX_LOCK;

	if (!(data->flags & NFS_MOUNT_NORDIRPLUS))

			server->caps |= NFS_CAP_READDIRPLUS;

	server->options = data->options;



	/* Get a client record */
@@ -779,13 +789,6 @@ static int nfs4_init_server(struct nfs_server *server, 
	if (error < 0)

		goto error;



	/*

	 * Don't use NFS uid/gid mapping if we're using AUTH_SYS or lower

	 * authentication.

	 */

	if (nfs4_disable_idmapping && data->auth_flavors[0] == RPC_AUTH_UNIX)

		server->caps |= NFS_CAP_UIDGID_NOMAP;



	if (data->rsize)

		server->rsize = nfs_block_size(data->rsize, NULL);

	if (data->wsize)
@@ -863,7 +866,6 @@ struct nfs_server *nfs4_create_referral_server(struct nfs_clone_mount *data, 


	/* Initialise the client representation from the parent server */

	nfs_server_copy_userdata(server, parent_server);

	server->caps |= NFS_CAP_ATOMIC_OPEN|NFS_CAP_CHANGE_ATTR;



	/* Get a client representation.

	 * Note: NFSv4 always uses TCP, */

fs/nfs/nfs4proc.c

+8 −0
Original line number Diff line number Diff line
@@ -6823,6 +6823,10 @@ static const struct nfs4_state_maintenance_ops nfs41_state_renewal_ops = { 


static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = {

	.minor_version = 0,

	.init_caps = NFS_CAP_READDIRPLUS

		| NFS_CAP_ATOMIC_OPEN

		| NFS_CAP_CHANGE_ATTR

		| NFS_CAP_POSIX_LOCK,

	.call_sync = _nfs4_call_sync,

	.match_stateid = nfs4_match_stateid,

	.find_root_sec = nfs4_find_root_sec,
@@ -6834,6 +6838,10 @@ static const struct nfs4_minor_version_ops nfs_v4_0_minor_ops = { 
#if defined(CONFIG_NFS_V4_1)

static const struct nfs4_minor_version_ops nfs_v4_1_minor_ops = {

	.minor_version = 1,

	.init_caps = NFS_CAP_READDIRPLUS

		| NFS_CAP_ATOMIC_OPEN

		| NFS_CAP_CHANGE_ATTR

		| NFS_CAP_POSIX_LOCK,

	.call_sync = nfs4_call_sync_sequence,

	.match_stateid = nfs41_match_stateid,

	.find_root_sec = nfs41_find_root_sec,