Merge remote-tracking branch 'ovl/rename2' into for-linus

[cascardo/linux.git] / fs / sysv / namei.c

diff --git a/fs/sysv/namei.c b/fs/sysv/namei.c
index 765d79d..d8817f1 100644 (file)
--- a/fs/sysv/namei.c
+++ b/fs/sysv/namei.c
@@ -120,7 +120,7 @@ static int sysv_link(struct dentry * old_dentry, struct inode * dir,
 {
        struct inode *inode = d_inode(old_dentry);
 
-       inode->i_ctime = CURRENT_TIME_SEC;
+       inode->i_ctime = current_time(inode);
        inode_inc_link_count(inode);
        ihold(inode);
 
@@ -244,7 +244,7 @@ static int sysv_rename(struct inode * old_dir, struct dentry * old_dentry,
                if (!new_de)
                        goto out_dir;
                sysv_set_link(new_de, new_page, old_inode);
-               new_inode->i_ctime = CURRENT_TIME_SEC;
+               new_inode->i_ctime = current_time(new_inode);
                if (dir_de)
                        drop_nlink(new_inode);
                inode_dec_link_count(new_inode);
@@ -289,6 +289,6 @@ const struct inode_operations sysv_dir_inode_operations = {
        .mkdir          = sysv_mkdir,
        .rmdir          = sysv_rmdir,
        .mknod          = sysv_mknod,
-       .rename2        = sysv_rename,
+       .rename         = sysv_rename,
        .getattr        = sysv_getattr,
 };