Merge tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
Pull xfs cleanups from Darrick Wong: "We had a few more lateish cleanup patches come in for 5.3 -- a couple of syncups with the userspace libxfs code and a conversion of the XFS administrator's guide to ReST format. Summary: - Bring fs/xfs/libxfs/xfs_trans_inode.c in sync with userspace libxfs. - Convert the xfs administrator guide to rst and move it into the official admin guide under Documentation" * tag 'xfs-5.3-merge-13' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux: Documentation: filesystem: Convert xfs.txt to ReST xfs: sync up xfs_trans_inode with userspace xfs: move xfs_trans_inode.c to libxfs/
This commit is contained in:
@@ -49,6 +49,7 @@ xfs-y += $(addprefix libxfs/, \
|
||||
xfs_refcount_btree.o \
|
||||
xfs_sb.o \
|
||||
xfs_symlink_remote.o \
|
||||
xfs_trans_inode.o \
|
||||
xfs_trans_resv.o \
|
||||
xfs_types.o \
|
||||
)
|
||||
@@ -107,8 +108,7 @@ xfs-y += xfs_log.o \
|
||||
xfs_rmap_item.o \
|
||||
xfs_log_recover.o \
|
||||
xfs_trans_ail.o \
|
||||
xfs_trans_buf.o \
|
||||
xfs_trans_inode.o
|
||||
xfs_trans_buf.o
|
||||
|
||||
# optional features
|
||||
xfs-$(CONFIG_XFS_QUOTA) += xfs_dquot.o \
|
||||
|
@@ -66,6 +66,10 @@ xfs_trans_ichgtime(
|
||||
inode->i_mtime = tv;
|
||||
if (flags & XFS_ICHGTIME_CHG)
|
||||
inode->i_ctime = tv;
|
||||
if (flags & XFS_ICHGTIME_CREATE) {
|
||||
ip->i_d.di_crtime.t_sec = (int32_t)tv.tv_sec;
|
||||
ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec;
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
Reference in New Issue
Block a user