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

NFSv4: Clear NFS_CAP_OPEN_XOR and NFS_CAP_DELEGTIME if not supported 



_nfs4_server_capabilities() should clear capabilities that are not
supported by the server.

Fixes: d2a00cce ("NFSv4: Detect support for OPEN4_SHARE_ACCESS_WANT_OPEN_XOR_DELEGATION")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent dd5a8621

fs/nfs/nfs4proc.c

+2 −1
Original line number Diff line number Diff line
@@ -4015,7 +4015,8 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f 
		memcpy(server->attr_bitmask, res.attr_bitmask, sizeof(server->attr_bitmask));

		server->caps &=

			~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS |

			  NFS_CAP_SECURITY_LABEL | NFS_CAP_FS_LOCATIONS);

			  NFS_CAP_SECURITY_LABEL | NFS_CAP_FS_LOCATIONS |

			  NFS_CAP_OPEN_XOR | NFS_CAP_DELEGTIME);

		server->fattr_valid = NFS_ATTR_FATTR_V4;

		if (res.attr_bitmask[0] & FATTR4_WORD0_ACL &&

				res.acl_bitmask & ACL4_SUPPORT_ALLOW_ACL)