]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
gfs2: replace CURRENT_TIME with current_time
authorStephen Rothwell <sfr@canb.auug.org.au>
Mon, 8 May 2017 22:59:34 +0000 (15:59 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 9 May 2017 00:15:15 +0000 (17:15 -0700)
Link: http://lkml.kernel.org/r/20170420161852.0492bc3f@canb.auug.org.au
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
fs/gfs2/bmap.c

index 3814a60e0aeae8ed38a3aad55786983c31c145b7..4d810be532ddcb6d9d18b234383c5167b0780e32 100644 (file)
@@ -1072,7 +1072,7 @@ out_unlock:
                        /* Every transaction boundary, we rewrite the dinode
                           to keep its di_blocks current in case of failure. */
                        ip->i_inode.i_mtime = ip->i_inode.i_ctime =
-                               CURRENT_TIME;
+                               current_time(&ip->i_inode);
                        gfs2_trans_add_meta(ip->i_gl, dibh);
                        gfs2_dinode_out(ip, dibh->b_data);
                        up_write(&ip->i_rw_mutex);
@@ -1293,7 +1293,7 @@ static int trunc_dealloc(struct gfs2_inode *ip, u64 newsize)
                gfs2_statfs_change(sdp, 0, +btotal, 0);
                gfs2_quota_change(ip, -(s64)btotal, ip->i_inode.i_uid,
                                  ip->i_inode.i_gid);
-               ip->i_inode.i_mtime = ip->i_inode.i_ctime = CURRENT_TIME;
+               ip->i_inode.i_mtime = ip->i_inode.i_ctime = current_time(&ip->i_inode);
                gfs2_trans_add_meta(ip->i_gl, dibh);
                gfs2_dinode_out(ip, dibh->b_data);
                up_write(&ip->i_rw_mutex);