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

Commit ff3525a5 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Don't apply NFS_MOUNT_FLAGMASK to text-based mounts 



The point of introducing text-based mounts was to allow us to add
functionality without having to worry about legacy binary mount formats.
The mask should be there in order to ensure that binary formats don't start
enabling features that they cannot support. There is no justification for
applying it to the text mount path.

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

fs/nfs/client.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -675,7 +675,7 @@ static int nfs_init_server(struct nfs_server *server, 
	server->nfs_client = clp;

	server->nfs_client = clp;





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

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

	server->flags = data->flags & NFS_MOUNT_FLAGMASK;

	server->flags = data->flags;





	if (data->rsize)

	if (data->rsize)

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

		server->rsize = nfs_block_size(data->rsize, NULL);
@@ -1072,7 +1072,7 @@ static int nfs4_init_server(struct nfs_server *server, 
		goto error;

		goto error;





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

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

	server->flags = data->flags & NFS_MOUNT_FLAGMASK;

	server->flags = data->flags;

	server->caps |= NFS_CAP_ATOMIC_OPEN;

	server->caps |= NFS_CAP_ATOMIC_OPEN;





	if (data->rsize)

	if (data->rsize)

fs/nfs/super.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -1550,7 +1550,7 @@ static int nfs_validate_mount_data(void *options, 
		 * Translate to nfs_parsed_mount_data, which nfs_fill_super

		 * Translate to nfs_parsed_mount_data, which nfs_fill_super

		 * can deal with.

		 * can deal with.

		 */

		 */

		args->flags		= data->flags;

		args->flags		= data->flags & NFS_MOUNT_FLAGMASK;

		args->rsize		= data->rsize;

		args->rsize		= data->rsize;

		args->wsize		= data->wsize;

		args->wsize		= data->wsize;

		args->timeo		= data->timeo;

		args->timeo		= data->timeo;