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

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

diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index f2f11c3..8eca4ed 100644 (file)
--- a/fs/ufs/namei.c
+++ b/fs/ufs/namei.c
@@ -153,7 +153,7 @@ static int ufs_link (struct dentry * old_dentry, struct inode * dir,
        struct inode *inode = d_inode(old_dentry);
        int error;
 
        struct inode *inode = d_inode(old_dentry);
        int error;
 

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

        inode_inc_link_count(inode);
        ihold(inode);
 
        inode_inc_link_count(inode);
        ihold(inode);
 


@@ -283,7 +283,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
                if (!new_de)
                        goto out_dir;
                ufs_set_link(new_dir, new_de, new_page, old_inode, 1);
                if (!new_de)
                        goto out_dir;
                ufs_set_link(new_dir, new_de, new_page, old_inode, 1);

-               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);


@@ -299,7 +299,7 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
         * Like most other Unix systems, set the ctime for inodes on a
         * rename.
         */
         * Like most other Unix systems, set the ctime for inodes on a
         * rename.
         */

-       old_inode->i_ctime = CURRENT_TIME_SEC;
+       old_inode->i_ctime = current_time(old_inode);

 
        ufs_delete_entry(old_dir, old_de, old_page);
        mark_inode_dirty(old_inode);
 
        ufs_delete_entry(old_dir, old_de, old_page);
        mark_inode_dirty(old_inode);