xfs: redefine xfs_ictimestamp_t
Redefine xfs_ictimestamp_t as a uint64_t typedef in preparation for the bigtime functionality. Preserve the legacy structure format so that we can let the compiler take care of the masking and shifting. Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Reviewed-by: Gao Xiang <hsiangkao@redhat.com> Reviewed-by: Dave Chinner <dchinner@redhat.com>
这个提交包含在:
@@ -295,6 +295,24 @@ xfs_inode_item_format_attr_fork(
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Convert an incore timestamp to a log timestamp. Note that the log format
|
||||
* specifies host endian format!
|
||||
*/
|
||||
static inline xfs_ictimestamp_t
|
||||
xfs_inode_to_log_dinode_ts(
|
||||
const struct timespec64 tv)
|
||||
{
|
||||
struct xfs_legacy_ictimestamp *lits;
|
||||
xfs_ictimestamp_t its;
|
||||
|
||||
lits = (struct xfs_legacy_ictimestamp *)&its;
|
||||
lits->t_sec = tv.tv_sec;
|
||||
lits->t_nsec = tv.tv_nsec;
|
||||
|
||||
return its;
|
||||
}
|
||||
|
||||
static void
|
||||
xfs_inode_to_log_dinode(
|
||||
struct xfs_inode *ip,
|
||||
@@ -313,12 +331,9 @@ xfs_inode_to_log_dinode(
|
||||
|
||||
memset(to->di_pad, 0, sizeof(to->di_pad));
|
||||
memset(to->di_pad3, 0, sizeof(to->di_pad3));
|
||||
to->di_atime.t_sec = inode->i_atime.tv_sec;
|
||||
to->di_atime.t_nsec = inode->i_atime.tv_nsec;
|
||||
to->di_mtime.t_sec = inode->i_mtime.tv_sec;
|
||||
to->di_mtime.t_nsec = inode->i_mtime.tv_nsec;
|
||||
to->di_ctime.t_sec = inode->i_ctime.tv_sec;
|
||||
to->di_ctime.t_nsec = inode->i_ctime.tv_nsec;
|
||||
to->di_atime = xfs_inode_to_log_dinode_ts(inode->i_atime);
|
||||
to->di_mtime = xfs_inode_to_log_dinode_ts(inode->i_mtime);
|
||||
to->di_ctime = xfs_inode_to_log_dinode_ts(inode->i_ctime);
|
||||
to->di_nlink = inode->i_nlink;
|
||||
to->di_gen = inode->i_generation;
|
||||
to->di_mode = inode->i_mode;
|
||||
@@ -340,8 +355,7 @@ xfs_inode_to_log_dinode(
|
||||
if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) {
|
||||
to->di_version = 3;
|
||||
to->di_changecount = inode_peek_iversion(inode);
|
||||
to->di_crtime.t_sec = from->di_crtime.tv_sec;
|
||||
to->di_crtime.t_nsec = from->di_crtime.tv_nsec;
|
||||
to->di_crtime = xfs_inode_to_log_dinode_ts(from->di_crtime);
|
||||
to->di_flags2 = from->di_flags2;
|
||||
to->di_cowextsize = from->di_cowextsize;
|
||||
to->di_ino = ip->i_ino;
|
||||
|
在新工单中引用
屏蔽一个用户