4 files changed, 15 insertions, 11 deletions

diff --git a/fs/ufs/dir.c b/fs/ufs/dir.c
index fa3bda1a860f..de01b8f2aa78 100644
--- a/fs/ufs/dir.c
+++ b/fs/ufs/dir.c
@@ -100,7 +100,7 @@ void ufs_set_link(struct inode *dir, struct ufs_dir_entry *de,
         err = ufs_commit_chunk(page, pos, len);
         ufs_put_page(page);
         if (update_times)
-                dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+                dir->i_mtime = dir->i_ctime = current_time(dir);
         mark_inode_dirty(dir);
 }
 
@@ -389,7 +389,7 @@ got_it:
         ufs_set_de_type(sb, de, inode->i_mode);
 
         err = ufs_commit_chunk(page, pos, rec_len);
-        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+        dir->i_mtime = dir->i_ctime = current_time(dir);
 
         mark_inode_dirty(dir);
         /* OFFSET_CACHE */
@@ -530,7 +530,7 @@ int ufs_delete_entry(struct inode *inode, struct ufs_dir_entry *dir,
                 pde->d_reclen = cpu_to_fs16(sb, to - from);
         dir->d_ino = 0;
         err = ufs_commit_chunk(page, pos, to - from);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
         mark_inode_dirty(inode);
 out:
         ufs_put_page(page);
diff --git a/fs/ufs/ialloc.c b/fs/ufs/ialloc.c
index fd0203ce1f7f..9774555b3721 100644
--- a/fs/ufs/ialloc.c
+++ b/fs/ufs/ialloc.c
@@ -290,7 +290,7 @@ cg_found:
         inode_init_owner(inode, dir, mode);
         inode->i_blocks = 0;
         inode->i_generation = 0;
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         ufsi->i_flags = UFS_I(dir)->i_flags;
         ufsi->i_lastfrag = 0;
         ufsi->i_shadow = 0;
diff --git a/fs/ufs/inode.c b/fs/ufs/inode.c
index e4a4d248a0f5..190d64be22ed 100644
--- a/fs/ufs/inode.c
+++ b/fs/ufs/inode.c
@@ -293,7 +293,7 @@ ufs_inode_getfrag(struct inode *inode, unsigned index,
 
         if (new)
                 *new = 1;
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         if (IS_SYNC(inode))
                 ufs_sync_inode (inode);
         mark_inode_dirty(inode);
@@ -375,7 +375,7 @@ ufs_inode_getblock(struct inode *inode, u64 ind_block,
         mark_buffer_dirty(bh);
         if (IS_SYNC(inode))
                 sync_dirty_buffer(bh);
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         mark_inode_dirty(inode);
 out:
         brelse (bh);
@@ -1185,7 +1185,7 @@ static int ufs_truncate(struct inode *inode, loff_t size)
         truncate_setsize(inode, size);
 
         __ufs_truncate_blocks(inode);
-        inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_ctime = current_time(inode);
         mark_inode_dirty(inode);
 out:
         UFSD("EXIT: err %d\n", err);
diff --git a/fs/ufs/namei.c b/fs/ufs/namei.c
index a1559f762805..8eca4eda8450 100644
--- 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;
 
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         inode_inc_link_count(inode);
         ihold(inode);
 
@@ -245,7 +245,8 @@ static int ufs_rmdir (struct inode * dir, struct dentry *dentry)
 }
 
 static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
-                      struct inode *new_dir, struct dentry *new_dentry)
+                      struct inode *new_dir, struct dentry *new_dentry,
+                      unsigned int flags)
 {
         struct inode *old_inode = d_inode(old_dentry);
         struct inode *new_inode = d_inode(new_dentry);
@@ -255,6 +256,9 @@ static int ufs_rename(struct inode *old_dir, struct dentry *old_dentry,
         struct ufs_dir_entry *old_de;
         int err = -ENOENT;
 
+        if (flags & ~RENAME_NOREPLACE)
+                return -EINVAL;
+
         old_de = ufs_find_entry(old_dir, &old_dentry->d_name, &old_page);
         if (!old_de)
                 goto out;
@@ -279,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);
-                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);
@@ -295,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.
          */
-        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);