Skip to content

Commit dd5a862

Browse files
author
Trond Myklebust
committed
NFSv4: Clear the NFS_CAP_FS_LOCATIONS flag if it is not set
_nfs4_server_capabilities() is expected to clear any flags that are not supported by the server. Fixes: 8a59bb9 ("NFSv4 store server support for fs_location attribute") Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent 31f1a96 commit dd5a862

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

fs/nfs/nfs4proc.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4013,8 +4013,9 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f
40134013
res.attr_bitmask[2];
40144014
}
40154015
memcpy(server->attr_bitmask, res.attr_bitmask, sizeof(server->attr_bitmask));
4016-
server->caps &= ~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS |
4017-
NFS_CAP_SYMLINKS| NFS_CAP_SECURITY_LABEL);
4016+
server->caps &=
4017+
~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS |
4018+
NFS_CAP_SECURITY_LABEL | NFS_CAP_FS_LOCATIONS);
40184019
server->fattr_valid = NFS_ATTR_FATTR_V4;
40194020
if (res.attr_bitmask[0] & FATTR4_WORD0_ACL &&
40204021
res.acl_bitmask & ACL4_SUPPORT_ALLOW_ACL)

0 commit comments

Comments
 (0)