gfs2: replace CURRENT_TIME with current_time

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>
This commit is contained in:
Stephen Rothwell 2017-05-08 15:59:34 -07:00 коммит произвёл Linus Torvalds
Родитель 24d0d03c2e
Коммит b32c8c7648
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -1072,7 +1072,7 @@ out_unlock:
/* Every transaction boundary, we rewrite the dinode /* Every transaction boundary, we rewrite the dinode
to keep its di_blocks current in case of failure. */ to keep its di_blocks current in case of failure. */
ip->i_inode.i_mtime = ip->i_inode.i_ctime = 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_trans_add_meta(ip->i_gl, dibh);
gfs2_dinode_out(ip, dibh->b_data); gfs2_dinode_out(ip, dibh->b_data);
up_write(&ip->i_rw_mutex); 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_statfs_change(sdp, 0, +btotal, 0);
gfs2_quota_change(ip, -(s64)btotal, ip->i_inode.i_uid, gfs2_quota_change(ip, -(s64)btotal, ip->i_inode.i_uid,
ip->i_inode.i_gid); 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_trans_add_meta(ip->i_gl, dibh);
gfs2_dinode_out(ip, dibh->b_data); gfs2_dinode_out(ip, dibh->b_data);
up_write(&ip->i_rw_mutex); up_write(&ip->i_rw_mutex);