Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[cascardo/linux.git] / fs / f2fs / dir.c

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 12b5836..369f451 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -312,7 +312,7 @@ void f2fs_set_link(struct inode *dir, struct f2fs_dir_entry *de,
        f2fs_dentry_kunmap(dir, page);
        set_page_dirty(page);
 
        f2fs_dentry_kunmap(dir, page);
        set_page_dirty(page);
 

-       dir->i_mtime = dir->i_ctime = CURRENT_TIME;
+       dir->i_mtime = dir->i_ctime = current_time(dir);

        f2fs_mark_inode_dirty_sync(dir);
        f2fs_put_page(page, 1);
 }
        f2fs_mark_inode_dirty_sync(dir);
        f2fs_put_page(page, 1);
 }


@@ -465,7 +465,7 @@ void update_parent_metadata(struct inode *dir, struct inode *inode,
                        f2fs_i_links_write(dir, true);
                clear_inode_flag(inode, FI_NEW_INODE);
        }
                        f2fs_i_links_write(dir, true);
                clear_inode_flag(inode, FI_NEW_INODE);
        }

-       dir->i_mtime = dir->i_ctime = CURRENT_TIME;
+       dir->i_mtime = dir->i_ctime = current_time(dir);

        f2fs_mark_inode_dirty_sync(dir);
 
        if (F2FS_I(dir)->i_current_depth != current_depth)
        f2fs_mark_inode_dirty_sync(dir);
 
        if (F2FS_I(dir)->i_current_depth != current_depth)


@@ -683,7 +683,7 @@ void f2fs_drop_nlink(struct inode *dir, struct inode *inode)
 
        if (S_ISDIR(inode->i_mode))
                f2fs_i_links_write(dir, false);
 
        if (S_ISDIR(inode->i_mode))
                f2fs_i_links_write(dir, false);

-       inode->i_ctime = CURRENT_TIME;
+       inode->i_ctime = current_time(inode);

 
        f2fs_i_links_write(inode, false);
        if (S_ISDIR(inode->i_mode)) {
 
        f2fs_i_links_write(inode, false);
        if (S_ISDIR(inode->i_mode)) {


@@ -730,7 +730,7 @@ void f2fs_delete_entry(struct f2fs_dir_entry *dentry, struct page *page,
        kunmap(page); /* kunmap - pair of f2fs_find_entry */
        set_page_dirty(page);
 
        kunmap(page); /* kunmap - pair of f2fs_find_entry */
        set_page_dirty(page);
 

-       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)
        f2fs_mark_inode_dirty_sync(dir);
 
        if (inode)