Browse Source

xfs: kill vn_atime_* helpers.

Two out of three are unused already, and the third is better done open-coded
with a comment describing what's going on here.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Dave Chinner <david@fromorbit.com>
Christoph Hellwig 16 years ago
parent
commit
8fab451e3c
2 changed files with 6 additions and 20 deletions
  1. 0 19
      fs/xfs/linux-2.6/xfs_vnode.h
  2. 6 1
      fs/xfs/xfs_itable.c

+ 0 - 19
fs/xfs/linux-2.6/xfs_vnode.h

@@ -57,25 +57,6 @@ static inline int VN_BAD(struct inode *vp)
 	return is_bad_inode(vp);
 	return is_bad_inode(vp);
 }
 }
 
 
-/*
- * Extracting atime values in various formats
- */
-static inline void vn_atime_to_bstime(struct inode *vp, xfs_bstime_t *bs_atime)
-{
-	bs_atime->tv_sec = vp->i_atime.tv_sec;
-	bs_atime->tv_nsec = vp->i_atime.tv_nsec;
-}
-
-static inline void vn_atime_to_timespec(struct inode *vp, struct timespec *ts)
-{
-	*ts = vp->i_atime;
-}
-
-static inline void vn_atime_to_time_t(struct inode *vp, time_t *tt)
-{
-	*tt = vp->i_atime.tv_sec;
-}
-
 /*
 /*
  * Some useful predicates.
  * Some useful predicates.
  */
  */

+ 6 - 1
fs/xfs/xfs_itable.c

@@ -83,7 +83,12 @@ xfs_bulkstat_one_iget(
 	buf->bs_uid = dic->di_uid;
 	buf->bs_uid = dic->di_uid;
 	buf->bs_gid = dic->di_gid;
 	buf->bs_gid = dic->di_gid;
 	buf->bs_size = dic->di_size;
 	buf->bs_size = dic->di_size;
-	vn_atime_to_bstime(VFS_I(ip), &buf->bs_atime);
+	/*
+	 * We are reading the atime from the Linux inode because the
+	 * dinode might not be uptodate.
+	 */
+	buf->bs_atime.tv_sec = VFS_I(ip)->i_atime.tv_sec;
+	buf->bs_atime.tv_nsec = VFS_I(ip)->i_atime.tv_nsec;
 	buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
 	buf->bs_mtime.tv_sec = dic->di_mtime.t_sec;
 	buf->bs_mtime.tv_nsec = dic->di_mtime.t_nsec;
 	buf->bs_mtime.tv_nsec = dic->di_mtime.t_nsec;
 	buf->bs_ctime.tv_sec = dic->di_ctime.t_sec;
 	buf->bs_ctime.tv_sec = dic->di_ctime.t_sec;