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_ctldir.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_ctldir.c')
| -rw-r--r-- | module/zfs/zpl_ctldir.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/module/zfs/zpl_ctldir.c b/module/zfs/zpl_ctldir.c index bd8af3928..1c5fb34e6 100644 --- a/module/zfs/zpl_ctldir.c +++ b/module/zfs/zpl_ctldir.c @@ -103,8 +103,10 @@ static int zpl_root_getattr_impl(const struct path *path, struct kstat *stat, u32 request_mask, unsigned int query_flags) { - generic_fillattr(path->dentry->d_inode, stat); - stat->atime = CURRENT_TIME; + struct inode *ip = path->dentry->d_inode; + + generic_fillattr(ip, stat); + stat->atime = current_time(ip); return (0); } @@ -377,14 +379,15 @@ static int zpl_snapdir_getattr_impl(const struct path *path, struct kstat *stat, u32 request_mask, unsigned int query_flags) { - zfsvfs_t *zfsvfs = ITOZSB(path->dentry->d_inode); + struct inode *ip = path->dentry->d_inode; + zfsvfs_t *zfsvfs = ITOZSB(ip); ZFS_ENTER(zfsvfs); - generic_fillattr(path->dentry->d_inode, stat); + generic_fillattr(ip, stat); stat->nlink = stat->size = 2; stat->ctime = stat->mtime = dmu_objset_snap_cmtime(zfsvfs->z_os); - stat->atime = CURRENT_TIME; + stat->atime = current_time(ip); ZFS_EXIT(zfsvfs); return (0); @@ -522,7 +525,7 @@ zpl_shares_getattr_impl(const struct path *path, struct kstat *stat, if (zfsvfs->z_shares_dir == 0) { generic_fillattr(path->dentry->d_inode, stat); stat->nlink = stat->size = 2; - stat->atime = CURRENT_TIME; + stat->atime = current_time(ip); ZFS_EXIT(zfsvfs); return (0); } |