kevin/linux
1
Fork 0
Code

nfsd-6.5 fixes:

Browse Source 
- Fix ordering of attributes in NFSv4 GETATTR replies
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEKLLlsBKG3yQ88j7+M2qzM29mf5cFAmSfFEwACgkQM2qzM29m
 f5eHCw/8C3EAIsYGSe+aREUZgH7/m3JlElkrGA6IcKP6kKN9ZD7x0RIDxnkqcnbv
 73fmbgXrbu5NjjtvT9WHwS4yJPNKvU3xiVEMKJKelEdkboG4Qb76r951wzTkXK25
 ev/68BzYfbuX36Wa/21Gp/PmisqlspQjbk3X7zckCk8KM6PWvAO4HrmA7+VOkHMP
 tTVc3Bd482DqgCNmG7fz8UHeW97itkr8w4oFSgifuzQLC3h6f28yyxI9pQ0bFSn/
 fdcAOxx5W9crQ+lwIaHCzPZa8N+oGt0amqKXeqnyvY5FmH7Q3SjZ/9h07QRt7q4m
 sUb0peHpraOWB+rGMy6pcq4XxDEVhPsiJiM/hiHCtobZS18PEPn7Dd7ybC5GkUVC
 9H6hKSwvkubgsBzKZOmrO5trKCW4g3tSSnQ4olJbIA39neijtDsshi9UkZrbqm44
 54cg6DsTY/CzIYVzGqf9TRL18uf7yzYtadGwmM3fn03i+BDD8p7iS0VNinfekvJA
 PIL0DWpQLfU49fFKgTphe968fXbGA9aDgP2Lu379qYf7UdcpQ8N2t5BszsS2Sdkv
 U3wwNbhMNS3WZrlLXj+zgR+zJCEIo4YwPG23XSujFyrd0W46DbYvCpMSzOsKDM8B
 ZV6yiX4/G1Byr8GSffmKrmezXTGJS5BguiBi1D95o2pFMLw0eFo=
 =F59G
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2023-06-30 21:48:44 -07:00
commit ee152be17a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
fs/nfsd/nfs4xdr.c
View File

@ -3370,6 +3370,11 @@ out_acl:
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 @@ out_acl:
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;