Commit ee152be1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'nfsd-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux 

Pull nfsd fix from Chuck Lever:

 - Fix ordering of attributes in NFSv4 GETATTR replies

* tag 'nfsd-6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux:
  nfsd: Fix creation time serialization order
parents f4ce392b d7dbed45

fs/nfsd/nfs4xdr.c

+5 −5
Original line number Diff line number Diff line
@@ -3370,6 +3370,11 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, 
		if (status)

			goto out;

	}

	if (bmval1 & FATTR4_WORD1_TIME_CREATE) {

		status = nfsd4_encode_nfstime4(xdr, &stat.btime);

		if (status)

			goto out;

	}

	if (bmval1 & FATTR4_WORD1_TIME_DELTA) {

		p = xdr_reserve_space(xdr, 12);

		if (!p)
@@ -3386,11 +3391,6 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp, 
		if (status)

			goto out;

	}

	if (bmval1 & FATTR4_WORD1_TIME_CREATE) {

		status = nfsd4_encode_nfstime4(xdr, &stat.btime);

		if (status)

			goto out;

	}

	if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {

		u64 ino = stat.ino;