projects
/
linux-2.6-block.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
[linux-2.6-block.git]
/
fs
/
f2fs
/
xattr.c
diff --git
a/fs/f2fs/xattr.c
b/fs/f2fs/xattr.c
index 1f74876233b66f2e1b4c6aea17b740eaae29ff3f..3e1c0280f8661dd26c790e682260ec01c422df48 100644
(file)
--- a/
fs/f2fs/xattr.c
+++ b/
fs/f2fs/xattr.c
@@
-548,7
+548,7
@@
static int __f2fs_setxattr(struct inode *inode, int index,
if (is_inode_flag_set(inode, FI_ACL_MODE)) {
inode->i_mode = F2FS_I(inode)->i_acl_mode;
- inode->i_ctime =
CURRENT_TIME
;
+ inode->i_ctime =
current_time(inode)
;
clear_inode_flag(inode, FI_ACL_MODE);
}
if (index == F2FS_XATTR_INDEX_ENCRYPTION &&