ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-22 20:30:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
parent f4ce392b03 d7dbed457c
commit ee152be17a
1 changed files with 5 additions and 5 deletions
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) if (status)
goto out; 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) { if (bmval1 & FATTR4_WORD1_TIME_DELTA) {
p = xdr_reserve_space(xdr, 12); p = xdr_reserve_space(xdr, 12);
if (!p) if (!p)
@@ -3386,11 +3391,6 @@ out_acl:
if (status) if (status)
goto out; 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) { if (bmval1 & FATTR4_WORD1_MOUNTED_ON_FILEID) {
u64 ino = stat.ino; u64 ino = stat.ino;