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

Linux 5.6 compat: timestamp_truncate() 

The timestamp_truncate() function was added, it replaces the existing
timespec64_trunc() function.  This change renames our wrapper function
to be consistent with the upstream name and updates the compatibility
code for older kernels accordingly.

Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #9956
Closes #9961
This commit is contained in:
Brian Behlendorf 2020-02-06 12:37:25 -08:00
parent 0dd7364853
commit 795699a6cc
4 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
config/kernel-inode-times.m4
View File

@ -1,8 +1,22 @@
dnl #
dnl # 4.18 API change
dnl # i_atime, i_mtime, and i_ctime changed from timespec to timespec64.
dnl #
AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [
dnl #
dnl # 5.6 API change
dnl # timespec64_trunc() replaced by timestamp_truncate() interface.
dnl #
ZFS_LINUX_TEST_SRC([timestamp_truncate], [
#include <linux/fs.h>
],[
struct timespec64 ts;
struct inode ip;
ts = timestamp_truncate(ts, &ip);
])
dnl #
dnl # 4.18 API change
dnl # i_atime, i_mtime, and i_ctime changed from timespec to timespec64.
dnl #
ZFS_LINUX_TEST_SRC([inode_times], [ ZFS_LINUX_TEST_SRC([inode_times], [
#include <linux/fs.h> #include <linux/fs.h>
],[ ],[
@ -15,6 +29,15 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [
]) ])
AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [ AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [
AC_MSG_CHECKING([whether timestamp_truncate() exists])
ZFS_LINUX_TEST_RESULT([timestamp_truncate], [
AC_MSG_RESULT(yes)
AC_DEFINE(HAVE_INODE_TIMESTAMP_TRUNCATE, 1,
[timestamp_truncate() exists])
],[
AC_MSG_RESULT(no)
])
AC_MSG_CHECKING([whether inode->i_*time's are timespec64]) AC_MSG_CHECKING([whether inode->i_*time's are timespec64])
ZFS_LINUX_TEST_RESULT([inode_times], [ ZFS_LINUX_TEST_RESULT([inode_times], [
AC_MSG_RESULT(no) AC_MSG_RESULT(no)

13
include/os/linux/zfs/sys/zpl.h
View File

@ -170,13 +170,14 @@ zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx)
} }
#endif /* HAVE_VFS_ITERATE */ #endif /* HAVE_VFS_ITERATE */
/* #if defined(HAVE_INODE_TIMESTAMP_TRUNCATE)
* Linux 4.18, inode times converted from timespec to timespec64. #define zpl_inode_timestamp_truncate(ts, ip) timestamp_truncate(ts, ip)
*/ #elif defined(HAVE_INODE_TIMESPEC64_TIMES)
#if defined(HAVE_INODE_TIMESPEC64_TIMES) #define zpl_inode_timestamp_truncate(ts, ip) \
#define zpl_inode_timespec_trunc(ts, gran) timespec64_trunc(ts, gran) timespec64_trunc(ts, (ip)->i_sb->s_time_gran)
#else #else
#define zpl_inode_timespec_trunc(ts, gran) timespec_trunc(ts, gran) #define zpl_inode_timestamp_truncate(ts, ip) \
timespec_trunc(ts, (ip)->i_sb->s_time_gran)
#endif #endif
#endif /* _SYS_ZPL_H */ #endif /* _SYS_ZPL_H */

8
module/os/linux/zfs/zfs_vnops.c
View File

@ -3444,8 +3444,8 @@ top:
if (mask & (ATTR_MTIME | ATTR_SIZE)) { if (mask & (ATTR_MTIME | ATTR_SIZE)) {
ZFS_TIME_ENCODE(&vap->va_mtime, mtime); ZFS_TIME_ENCODE(&vap->va_mtime, mtime);
ZTOI(zp)->i_mtime = zpl_inode_timespec_trunc(vap->va_mtime, ZTOI(zp)->i_mtime = zpl_inode_timestamp_truncate(
ZTOI(zp)->i_sb->s_time_gran); vap->va_mtime, ZTOI(zp));
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL, SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL,
mtime, sizeof (mtime)); mtime, sizeof (mtime));
@ -3453,8 +3453,8 @@ top:
if (mask & (ATTR_CTIME | ATTR_SIZE)) { if (mask & (ATTR_CTIME | ATTR_SIZE)) {
ZFS_TIME_ENCODE(&vap->va_ctime, ctime); ZFS_TIME_ENCODE(&vap->va_ctime, ctime);
ZTOI(zp)->i_ctime = zpl_inode_timespec_trunc(vap->va_ctime, ZTOI(zp)->i_ctime = zpl_inode_timestamp_truncate(vap->va_ctime,
ZTOI(zp)->i_sb->s_time_gran); ZTOI(zp));
SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL, SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL,
ctime, sizeof (ctime)); ctime, sizeof (ctime));
} }

6
module/os/linux/zfs/zpl_inode.c
View File

@ -382,10 +382,8 @@ zpl_setattr(struct dentry *dentry, struct iattr *ia)
vap->va_mtime = ia->ia_mtime; vap->va_mtime = ia->ia_mtime;
vap->va_ctime = ia->ia_ctime; vap->va_ctime = ia->ia_ctime;
if (vap->va_mask & ATTR_ATIME) { if (vap->va_mask & ATTR_ATIME)
ip->i_atime = zpl_inode_timespec_trunc(ia->ia_atime, ip->i_atime = zpl_inode_timestamp_truncate(ia->ia_atime, ip);
ip->i_sb->s_time_gran);
}
cookie = spl_fstrans_mark(); cookie = spl_fstrans_mark();
error = -zfs_setattr(ITOZ(ip), vap, 0, cr); error = -zfs_setattr(ITOZ(ip), vap, 0, cr);