projects
/
linux-2.6-microblaze.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
24d0d03
)
gfs2: replace CURRENT_TIME with current_time
author
Stephen Rothwell
<sfr@canb.auug.org.au>
Mon, 8 May 2017 22:59:34 +0000
(15:59 -0700)
committer
Linus 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
patch
|
blob
|
history
diff --git
a/fs/gfs2/bmap.c
b/fs/gfs2/bmap.c
index
3814a60
..
4d810be
100644
(file)
--- a/
fs/gfs2/bmap.c
+++ b/
fs/gfs2/bmap.c
@@
-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 =
/* 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);
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);
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);
gfs2_trans_add_meta(ip->i_gl, dibh);
gfs2_dinode_out(ip, dibh->b_data);
up_write(&ip->i_rw_mutex);