Commit 3201f3dd authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFSv4: Fix a regression in decode_getfattr 



We don't want to have the mounted_on_fileid overwrite the true fileid. We
only return the former if the server didn't supply the true fileid.

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

fs/nfs/nfs4xdr.c

+1 −1
Original line number Diff line number Diff line
@@ -3912,7 +3912,7 @@ static int decode_getfattr_attrs(struct xdr_stream *xdr, uint32_t *bitmap, 
	status = decode_attr_mounted_on_fileid(xdr, bitmap, &fileid);

	if (status < 0)

		goto xdr_error;

	if (status != 0) {

	if (status != 0 && !(fattr->valid & status)) {

		fattr->fileid = fileid;

		fattr->valid |= status;

	}