diff options
| author | Nathan Scott <nathans@sgi.com> | 2006-01-11 21:03:04 +1100 |
|---|---|---|
| committer | Nathan Scott <nathans@sgi.com> | 2006-01-11 21:03:04 +1100 |
| commit | ca5ccbf98d792d8727e893765cc2df479ba399f2 (patch) | |
| tree | 5e325ee9d845f9a84bdfa8009866e51013edfa3a /fs | |
| parent | 1259845d3f3e1d1cf96b2a78f3aec824b9d1e109 (diff) | |
| download | kernel_samsung_crespo-ca5ccbf98d792d8727e893765cc2df479ba399f2.zip kernel_samsung_crespo-ca5ccbf98d792d8727e893765cc2df479ba399f2.tar.gz kernel_samsung_crespo-ca5ccbf98d792d8727e893765cc2df479ba399f2.tar.bz2 | |
[XFS] Fix some build fallout from atime changes.
SGI-PV: 946679
SGI-Modid: xfs-linux-melb:xfs-kern:24899a
Signed-off-by: Nathan Scott <nathans@sgi.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/xfs/linux-2.6/xfs_vnode.h | 19 | ||||
| -rw-r--r-- | fs/xfs/xfs_itable.c | 4 | ||||
| -rw-r--r-- | fs/xfs/xfs_vnodeops.c | 3 |
3 files changed, 21 insertions, 5 deletions
diff --git a/fs/xfs/linux-2.6/xfs_vnode.h b/fs/xfs/linux-2.6/xfs_vnode.h index f2bbb32..0fe2419 100644 --- a/fs/xfs/linux-2.6/xfs_vnode.h +++ b/fs/xfs/linux-2.6/xfs_vnode.h @@ -566,6 +566,25 @@ static inline int VN_BAD(struct vnode *vp) } /* + * Extracting atime values in various formats + */ +static inline void vn_atime_to_bstime(struct vnode *vp, xfs_bstime_t *bs_atime) +{ + bs_atime->tv_sec = vp->v_inode.i_atime.tv_sec; + bs_atime->tv_nsec = vp->v_inode.i_atime.tv_nsec; +} + +static inline void vn_atime_to_timespec(struct vnode *vp, struct timespec *ts) +{ + *ts = vp->v_inode.i_atime; +} + +static inline void vn_atime_to_time_t(struct vnode *vp, time_t *tt) +{ + *tt = vp->v_inode.i_atime.tv_sec; +} + +/* * Some useful predicates. */ #define VN_MAPPED(vp) mapping_mapped(LINVFS_GET_IP(vp)->i_mapping) diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 41f50e7..c59450e 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c @@ -86,9 +86,7 @@ xfs_bulkstat_one_iget( buf->bs_uid = dic->di_uid; buf->bs_gid = dic->di_gid; buf->bs_size = dic->di_size; - /* atime is only kept uptodate in the Linux inode */ - buf->bs_atime.tv_sec = vp->v_inode.i_atime.tv_sec; - buf->bs_atime.tv_nsec = vp->v_inode.i_atime.tv_nsec; + vn_atime_to_bstime(vp, &buf->bs_atime); buf->bs_mtime.tv_sec = dic->di_mtime.t_sec; buf->bs_mtime.tv_nsec = dic->di_mtime.t_nsec; buf->bs_ctime.tv_sec = dic->di_ctime.t_sec; diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index b12fcfc..f891634 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c @@ -182,8 +182,7 @@ xfs_getattr( break; } - /* atime is only kept uptodate in the Linux inode */ - vap->va_atime = vp->v_inode.i_atime; + vn_atime_to_timespec(vp, &vap->va_atime); vap->va_mtime.tv_sec = ip->i_d.di_mtime.t_sec; vap->va_mtime.tv_nsec = ip->i_d.di_mtime.t_nsec; vap->va_ctime.tv_sec = ip->i_d.di_ctime.t_sec; |