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

[cascardo/linux.git] / fs / debugfs / inode.c

diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c
index 72361ba..f17fcf8 100644 (file)
--- a/fs/debugfs/inode.c
+++ b/fs/debugfs/inode.c
@@ -45,7 +45,7 @@ static struct inode *debugfs_get_inode(struct super_block *sb)
        if (inode) {
                inode->i_ino = get_next_ino();
                inode->i_atime = inode->i_mtime =
-                       inode->i_ctime = current_fs_time(sb);
+                       inode->i_ctime = current_time(inode);
        }
        return inode;
 }
@@ -748,7 +748,7 @@ struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry,
        old_name = fsnotify_oldname_init(old_dentry->d_name.name);
 
        error = simple_rename(d_inode(old_dir), old_dentry, d_inode(new_dir),
-               dentry);
+                             dentry, 0);
        if (error) {
                fsnotify_oldname_free(old_name);
                goto exit;