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

Commit fca22d52 authored by Trond Myklebust's avatar Trond Myklebust Committed by Greg Kroah-Hartman
Browse files

NFSv4.1: Work around a Linux server bug... 




[ Upstream commit f4b23de3dda1536590787c9e5c3d16b8738ab108 ]

It turns out the Linux server has a bug in its implementation of
supattr_exclcreat; it returns the set of all attributes, whether
or not they are supported by minor version 1.
In order to avoid a regression, we therefore apply the supported_attrs
as a mask on top of whatever the server sent us.

Reported-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 408719af

fs/nfs/nfs4proc.c

+6 −0
Original line number Diff line number Diff line
@@ -3300,6 +3300,7 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f 
		.rpc_resp = &res,

	};

	int status;

	int i;



	bitmask[0] = FATTR4_WORD0_SUPPORTED_ATTRS |

		     FATTR4_WORD0_FH_EXPIRE_TYPE |
@@ -3365,8 +3366,13 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f 
		server->cache_consistency_bitmask[0] &= FATTR4_WORD0_CHANGE|FATTR4_WORD0_SIZE;

		server->cache_consistency_bitmask[1] &= FATTR4_WORD1_TIME_METADATA|FATTR4_WORD1_TIME_MODIFY;

		server->cache_consistency_bitmask[2] = 0;



		/* Avoid a regression due to buggy server */

		for (i = 0; i < ARRAY_SIZE(res.exclcreat_bitmask); i++)

			res.exclcreat_bitmask[i] &= res.attr_bitmask[i];

		memcpy(server->exclcreat_bitmask, res.exclcreat_bitmask,

			sizeof(server->exclcreat_bitmask));



		server->acl_bitmask = res.acl_bitmask;

		server->fh_expire_type = res.fh_expire_type;

	}