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

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: 8a59bb93 ("NFSv4 store server support for fs_location attribute")
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@hammerspace.com>
parent 31f1a960

fs/nfs/nfs4proc.c

+3 −2
Original line number Diff line number Diff line
@@ -4013,8 +4013,9 @@ static int _nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *f 
				     res.attr_bitmask[2];

		}

		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);

		server->caps &=

			~(NFS_CAP_ACLS | NFS_CAP_HARDLINKS | NFS_CAP_SYMLINKS |

			  NFS_CAP_SECURITY_LABEL | NFS_CAP_FS_LOCATIONS);

		server->fattr_valid = NFS_ATTR_FATTR_V4;

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

				res.acl_bitmask & ACL4_SUPPORT_ALLOW_ACL)