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

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

diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index f7811d5..1e0f11f 100644 (file)
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -106,7 +106,7 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir,
 {
        struct inode *inode = d_inode(old_dentry);
 
 {
        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);
        return add_nondir(dentry, inode);
        inode_inc_link_count(inode);
        ihold(inode);
        return add_nondir(dentry, inode);


@@ -223,7 +223,7 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
                if (!new_de)
                        goto out_dir;
                minix_set_link(new_de, new_page, old_inode);
                if (!new_de)
                        goto out_dir;
                minix_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);
                if (dir_de)
                        drop_nlink(new_inode);
                inode_dec_link_count(new_inode);