Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b32c8c76 authored by Stephen Rothwell's avatar Stephen Rothwell Committed by Linus Torvalds
Browse files

gfs2: replace CURRENT_TIME with current_time 

Link: http://lkml.kernel.org/r/20170420161852.0492bc3f@canb.auug.org.au


Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 24d0d03c

fs/gfs2/bmap.c

+2 −2
Original line number Diff line number Diff line
@@ -1072,7 +1072,7 @@ static int sweep_bh_for_rgrps(struct gfs2_inode *ip, struct gfs2_holder *rd_gh, 
			/* 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);