From 096e7baf47378bd79754e2996c778c0f728eef38 Mon Sep 17 00:00:00 2001
From: Nathan Scott <nathans@sgi.com>
Date: Wed, 11 Jan 2006 21:03:04 +1100
Subject: [PATCH] --- yaml --- r: 18185 b: refs/heads/master c:
 ca5ccbf98d792d8727e893765cc2df479ba399f2 h: refs/heads/master i:   18183:
 a4093326cf75fc7eba5143fb19c2319ced8cc63b v: v3

---
 [refs]                             |  2 +-
 trunk/fs/xfs/linux-2.6/xfs_vnode.h | 19 +++++++++++++++++++
 trunk/fs/xfs/xfs_itable.c          |  4 +---
 trunk/fs/xfs/xfs_vnodeops.c        |  3 +--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index d42ca170337d..66230aed8c0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1259845d3f3e1d1cf96b2a78f3aec824b9d1e109
+refs/heads/master: ca5ccbf98d792d8727e893765cc2df479ba399f2
diff --git a/trunk/fs/xfs/linux-2.6/xfs_vnode.h b/trunk/fs/xfs/linux-2.6/xfs_vnode.h
index f2bbb327c081..0fe2419461d6 100644
--- a/trunk/fs/xfs/linux-2.6/xfs_vnode.h
+++ b/trunk/fs/xfs/linux-2.6/xfs_vnode.h
@@ -565,6 +565,25 @@ static inline int VN_BAD(struct vnode *vp)
 	return is_bad_inode(LINVFS_GET_IP(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.
  */
diff --git a/trunk/fs/xfs/xfs_itable.c b/trunk/fs/xfs/xfs_itable.c
index 41f50e7d1c32..c59450e1be40 100644
--- a/trunk/fs/xfs/xfs_itable.c
+++ b/trunk/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/trunk/fs/xfs/xfs_vnodeops.c b/trunk/fs/xfs/xfs_vnodeops.c
index b12fcfcb196d..f8916349a9c6 100644
--- a/trunk/fs/xfs/xfs_vnodeops.c
+++ b/trunk/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;