update timestamp in xfs_ialloc manually
PATCH 1/3 update timestamp in xfs_ialloc manually
In xfs_ialloc we just want to set all timestamps to the current time. We don't need to mark the inode dirty like xfs_ichgtime does, and we don't need nor want the opimizations in xfs_ichgtime that I will introduce in the next patch.
So just opencode the timestamp update in xfs_ialloc, and remove the new unused XFS_ICHGTIME_ACC case in xfs_ichgtime.
fs/xfs/linux-2.6/xfs_iops.c +0 -17
@@ -89,12 +89,6 @@ xfs_mark_inode_dirty_sync(* Change the requested timestamp in the given inode. * We don't lock across timestamp updates, and we don't log them but * we do record the fact that there is dirty information in core. -* -* NOTE -- callers MUST combine XFS_ICHGTIME_MOD or XFS_ICHGTIME_CHG -* with XFS_ICHGTIME_ACC to be sure that access time -* update will take. Calling first with XFS_ICHGTIME_ACC -* and then XFS_ICHGTIME_MOD may fail to modify the access -* timestamp if the filesystem is mounted noacctm. */ void xfs_ichgtime(
@@ -110,11 +104,6 @@ xfs_ichgtime( ip->i_d.di_mtime.t_sec = (__int32_t )tv.tv_sec; ip->i_d.di_mtime.t_nsec = (__int32_t )tv.tv_nsec; } -if (flags &XFS_ICHGTIME_ACC ) { - inode->i_atime = tv; - ip->i_d.di_atime.t_sec = (__int32_t )tv.tv_sec; - ip->i_d.di_atime.t_nsec = (__int32_t )tv.tv_nsec; - }if (flags &XFS_ICHGTIME_CHG ) { inode->i_ctime = tv; ip->i_d.di_ctime.t_sec = (__int32_t )tv.tv_sec;
@@ -150,12 +139,6 @@ xfs_ichgtime_fast(timespec_t *tvp;/* -* Atime updates for read() & friends are handled lazily now, and -* explicit updates must go through xfs_ichgtime() -*/ -ASSERT ((flags &XFS_ICHGTIME_ACC ) ==0 ); - -/* * We're not supposed to change timestamps in readonly-mounted * filesystems. Throw it away if anyone asks us. */
fs/xfs/xfs_inode.c +8 -1
@@ -1049,6 +1049,7 @@ xfs_ialloc(xfs_inode_t *ip;uint flags;int error; +timespec_t tv;/* * Call the space management code to pick
@@ -1129,7 +1130,13 @@ xfs_ialloc( ip->i_size =0 ; ip->i_d.di_nextents =0 ;ASSERT (ip->i_d.di_nblocks ==0 ); -xfs_ichgtime (ip,XFS_ICHGTIME_CHG |XFS_ICHGTIME_ACC |XFS_ICHGTIME_MOD ); + +nanotime (&tv); + ip->i_d.di_mtime.t_sec = (__int32_t )tv.tv_sec; + ip->i_d.di_mtime.t_nsec = (__int32_t )tv.tv_nsec; + ip->i_d.di_atime = ip->i_d.di_mtime; + ip->i_d.di_ctime = ip->i_d.di_mtime; +/* * di_gen will have been taken care of in xfs_iread. */
fs/xfs/xfs_inode.h +1 -2
@@ -87,8 +87,7 @@ typedef struct xfs_ifork {* Flags for xfs_ichgtime(). */ #define XFS_ICHGTIME_MOD 0x1/* data fork modification timestamp */ -#define XFS_ICHGTIME_ACC 0x2/* data fork access timestamp */ -#define XFS_ICHGTIME_CHG 0x4/* inode field change timestamp */ +#define XFS_ICHGTIME_CHG 0x2/* inode field change timestamp */ /* * Per-fork incore inode flags.
fs/xfs/xfs_vnodeops.c +0 -1
@@ -513,7 +513,6 @@ xfs_setattr( ip->i_d.di_atime.t_sec = iattr->ia_atime.tv_sec; ip->i_d.di_atime.t_nsec = iattr->ia_atime.tv_nsec; ip->i_update_core =1 ; - timeflags &= ~XFS_ICHGTIME_ACC ; }if (mask &ATTR_MTIME ) { inode->i_mtime = iattr->ia_mtime;
Quoted 4 lines · Christoph Hellwig
In
xfs_iallocwe just want to set all timestamps to the current time. We don't need to mark the inode dirty likexfs_ichgtimedoes, and we don't need nor want the opimizations inxfs_ichgtimethat I will introduce in the next patch.
Looks sane, and solves an issue with code I'm working on, too.
FWIW, the conditional check against I_NEW before marking the indo dirty can be removed as well, as this was call that required avoiding avoiding it.
Cheers,
Dave.
Signature · 2 lines
Dave Chinner [email protected]
Quoted 11 lines · Dave Chinner
Quoted 4 lines · Christoph Hellwig
In
xfs_iallocwe just want to set all timestamps to the current time. We don't need to mark the inode dirty likexfs_ichgtimedoes, and we don't need nor want the opimizations inxfs_ichgtimethat I will introduce in the next patch.Looks sane, and solves an issue with code I'm working on, too.
FWIW, the conditional check against
I_NEWbefore marking the indo dirty can be removed as well, as this was call that required avoiding avoiding it.
Yeah. Will update and retest the patch.