diff options
| author | Brian Behlendorf <[email protected]> | 2017-05-10 09:30:48 -0700 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-05-10 09:30:48 -0700 |
| commit | 2946a1a15aab874107b4425513c1bf805e730803 (patch) | |
| tree | 21b3f8b56ed293b626eefc6549aeb74342ae3eb5 /module/zfs/zpl_xattr.c | |
| parent | a3eeab2de68670a4481eab3d086982aff23b6906 (diff) | |
Linux 4.12 compat: CURRENT_TIME removed
Linux 4.9 added current_time() as the preferred interface to get
the filesystem time. CURRENT_TIME was retired in Linux 4.12.
Reviewed-by: Chunwei Chen <[email protected]>
Signed-off-by: Brian Behlendorf <[email protected]>
Closes #6114
Diffstat (limited to 'module/zfs/zpl_xattr.c')
| -rw-r--r-- | module/zfs/zpl_xattr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/module/zfs/zpl_xattr.c b/module/zfs/zpl_xattr.c index 5edabedd3..d3bb4bbf8 100644 --- a/module/zfs/zpl_xattr.c +++ b/module/zfs/zpl_xattr.c @@ -938,7 +938,6 @@ xattr_handler_t zpl_xattr_security_handler = { int zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type) { - struct super_block *sb = ITOZSB(ip)->z_sb; char *name, *value = NULL; int error = 0; size_t size = 0; @@ -964,7 +963,7 @@ zpl_set_acl(struct inode *ip, struct posix_acl *acl, int type) */ if (ip->i_mode != mode) { ip->i_mode = mode; - ip->i_ctime = current_fs_time(sb); + ip->i_ctime = current_time(ip); zfs_mark_inode_dirty(ip); } @@ -1130,7 +1129,7 @@ zpl_init_acl(struct inode *ip, struct inode *dir) if (!acl) { ip->i_mode &= ~current_umask(); - ip->i_ctime = current_fs_time(ITOZSB(ip)->z_sb); + ip->i_ctime = current_time(ip); zfs_mark_inode_dirty(ip); return (0); } |