projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[cascardo/linux.git]
/
fs
/
f2fs
/
file.c
diff --git
a/fs/f2fs/file.c
b/fs/f2fs/file.c
index
acdf4b9
..
c786507
100644
(file)
--- a/
fs/f2fs/file.c
+++ b/
fs/f2fs/file.c
@@
-631,7
+631,7
@@
int f2fs_truncate(struct inode *inode)
if (err)
return err;
if (err)
return err;
- inode->i_mtime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_mtime = inode->i_ctime =
current_time(inode)
;
f2fs_mark_inode_dirty_sync(inode);
return 0;
}
f2fs_mark_inode_dirty_sync(inode);
return 0;
}
@@
-708,7
+708,7
@@
int f2fs_setattr(struct dentry *dentry, struct iattr *attr)
if (err)
return err;
}
if (err)
return err;
}
- inode->i_mtime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_mtime = inode->i_ctime =
current_time(inode)
;
}
}
}
}
@@
-1392,7
+1392,7
@@
static long f2fs_fallocate(struct file *file, int mode,
}
if (!ret) {
}
if (!ret) {
- inode->i_mtime = inode->i_ctime =
CURRENT_TIME
;
+ inode->i_mtime = inode->i_ctime =
current_time(inode)
;
f2fs_mark_inode_dirty_sync(inode);
f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
}
f2fs_mark_inode_dirty_sync(inode);
f2fs_update_time(F2FS_I_SB(inode), REQ_TIME);
}
@@
-1484,7
+1484,7
@@
static int f2fs_ioc_setflags(struct file *filp, unsigned long arg)
fi->i_flags = flags;
inode_unlock(inode);
fi->i_flags = flags;
inode_unlock(inode);
- inode->i_ctime =
CURRENT_TIME
;
+ inode->i_ctime =
current_time(inode)
;
f2fs_set_inode_flags(inode);
out:
mnt_drop_write_file(filp);
f2fs_set_inode_flags(inode);
out:
mnt_drop_write_file(filp);