Skip to content

Commit ee152be

Browse files
committed
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
2 parents f4ce392 + d7dbed4 commit ee152be

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

fs/nfsd/nfs4xdr.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3370,6 +3370,11 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
33703370
if (status)
33713371
goto out;
33723372
}
3373+
if (bmval1 & FATTR4_WORD1_TIME_CREATE) {
3374+
status = nfsd4_encode_nfstime4(xdr, &stat.btime);
3375+
if (status)
3376+
goto out;
3377+
}
33733378
if (bmval1 & FATTR4_WORD1_TIME_DELTA) {
33743379
p = xdr_reserve_space(xdr, 12);
33753380
if (!p)
@@ -3386,11 +3391,6 @@ nfsd4_encode_fattr(struct xdr_stream *xdr, struct svc_fh *fhp,
33863391
if (status)
33873392
goto out;
33883393
}
3389-
if (bmval1 & FATTR4_WORD1_TIME_CREATE) {
3390-
status = nfsd4_encode_nfstime4(xdr, &stat.btime);
3391-
if (status)
3392-
goto out;
3393-
}
33943394
if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {
33953395
u64 ino = stat.ino;
33963396

0 commit comments

Comments
 (0)