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

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

diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c
index 572d124..6a4d0e5 100644 (file)
--- a/fs/fuse/dir.c
+++ b/fs/fuse/dir.c
@@ -647,7 +647,7 @@ static int fuse_symlink(struct inode *dir, struct dentry *entry,
 void fuse_update_ctime(struct inode *inode)
 {
        if (!IS_NOCMTIME(inode)) {
 void fuse_update_ctime(struct inode *inode)
 {
        if (!IS_NOCMTIME(inode)) {

-               inode->i_ctime = current_fs_time(inode->i_sb);
+               inode->i_ctime = current_time(inode);

                mark_inode_dirty_sync(inode);
        }
 }
                mark_inode_dirty_sync(inode);
        }
 }


@@ -1793,7 +1793,7 @@ static const struct inode_operations fuse_dir_inode_operations = {
        .symlink        = fuse_symlink,
        .unlink         = fuse_unlink,
        .rmdir          = fuse_rmdir,
        .symlink        = fuse_symlink,
        .unlink         = fuse_unlink,
        .rmdir          = fuse_rmdir,

-       .rename2        = fuse_rename2,
+       .rename         = fuse_rename2,

        .link           = fuse_link,
        .setattr        = fuse_setattr,
        .create         = fuse_create,
        .link           = fuse_link,
        .setattr        = fuse_setattr,
        .create         = fuse_create,