projects
/
linux-2.6-microblaze.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-microblaze.git]
/
fs
/
f2fs
/
inline.c
diff --git
a/fs/f2fs/inline.c
b/fs/f2fs/inline.c
index
34234d8
..
5f1a67f
100644
(file)
--- a/
fs/f2fs/inline.c
+++ b/
fs/f2fs/inline.c
@@
-572,7
+572,7
@@
void f2fs_delete_inline_entry(struct f2fs_dir_entry *dentry, struct page *page,
set_page_dirty(page);
f2fs_put_page(page, 1);
- dir->i_ctime = dir->i_mtime =
CURRENT_TIME
;
+ dir->i_ctime = dir->i_mtime =
current_time(dir)
;
f2fs_mark_inode_dirty_sync(dir);
if (inode)