Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Linux 6.7 compat: zfs_setattr fix atime update 

In db4fc559c I messed up and changed this bit of code to set the inode
atime to an uninitialised value, when actually it was just supposed to
loading the atime from the inode to be stored in the SA. This changes it
to what it should have been.

Ensure times change by the right amount Previously, we only checked
if the times changed at all, which missed a bug where the atime was
being set to an undefined value.

Now ensure the times change by two seconds (or thereabouts), ensuring
we catch cases where we set the time to something bonkers

Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Rob Norris <robn@despairlabs.com>
Sponsored-by: https://despairlabs.com/sponsor/
Closes #15762
Closes #15773
(cherry picked from commit 2ecc2dfe42)
This commit is contained in:
Rob N 2024-01-17 09:01:17 +11:00 committed by Tony Hutter
parent a9dc1166b6
commit 71d407cc39
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
module/os/linux/zfs/zfs_vnops_os.c
View File

@ -2450,9 +2450,8 @@ top:
if ((mask & ATTR_ATIME) || zp->z_atime_dirty) { if ((mask & ATTR_ATIME) || zp->z_atime_dirty) {
zp->z_atime_dirty = B_FALSE; zp->z_atime_dirty = B_FALSE;
inode_timespec_t tmp_atime; inode_timespec_t tmp_atime = zpl_inode_get_atime(ip);
ZFS_TIME_ENCODE(&tmp_atime, atime); ZFS_TIME_ENCODE(&tmp_atime, atime);
zpl_inode_set_atime_to_ts(ZTOI(zp), tmp_atime);
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_ATIME(zfsvfs), NULL, SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_ATIME(zfsvfs), NULL,
&atime, sizeof (atime)); &atime, sizeof (atime));
} }

14
tests/zfs-tests/tests/functional/ctime/ctime.c
View File

@ -362,12 +362,20 @@ main(int argc, char *argv[])
return (1); return (1);
} }
if (t1 == t2) {
(void) fprintf(stderr, "%s: t1(%ld) == t2(%ld)\n", /*
* Ideally, time change would be exactly two seconds, but allow
* a little slack in case of scheduling delays or similar.
*/
long delta = (long)t2 - (long)t1;
if (delta < 2 || delta > 4) {
(void) fprintf(stderr,
"%s: BAD time change: t1(%ld), t2(%ld)\n",
timetest_table[i].name, (long)t1, (long)t2); timetest_table[i].name, (long)t1, (long)t2);
return (1); return (1);
} else { } else {
(void) fprintf(stderr, "%s: t1(%ld) != t2(%ld)\n", (void) fprintf(stderr,
"%s: good time change: t1(%ld), t2(%ld)\n",
timetest_table[i].name, (long)t1, (long)t2); timetest_table[i].name, (long)t1, (long)t2);
} }
} }