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

Pull more vfs updates from Al Viro:
 ">rename2() work from Miklos + current_time() from Deepa"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fs: Replace current_fs_time() with current_time()
  fs: Replace CURRENT_TIME_SEC with current_time() for inode timestamps
  fs: Replace CURRENT_TIME with current_time() for inode timestamps
  fs: proc: Delete inode time initializations in proc_alloc_inode()
  vfs: Add current_time() api
  vfs: add note about i_op->rename changes to porting
  fs: rename "rename2" i_op to "rename"
  vfs: remove unused i_op->rename
  fs: make remaining filesystems use .rename2
  libfs: support RENAME_NOREPLACE in simple_rename()
  fs: support RENAME_NOREPLACE for local filesystems
  ncpfs: fix unused variable warning

1 files changed, 6 insertions, 6 deletions

diff --git a/fs/ocfs2/file.c b/fs/ocfs2/file.c
index ba5c177d0ed6..000c234d7bbd 100644
--- a/fs/ocfs2/file.c
+++ b/fs/ocfs2/file.c
@@ -253,7 +253,7 @@ int ocfs2_should_update_atime(struct inode *inode,
                 return 0;
         }
 
-        now = CURRENT_TIME;
+        now = current_time(inode);
         if ((now.tv_sec - inode->i_atime.tv_sec <= osb->s_atime_quantum))
                 return 0;
         else
@@ -287,7 +287,7 @@ int ocfs2_update_inode_atime(struct inode *inode,
          * have i_mutex to guard against concurrent changes to other
          * inode fields.
          */
-        inode->i_atime = CURRENT_TIME;
+        inode->i_atime = current_time(inode);
         di->i_atime = cpu_to_le64(inode->i_atime.tv_sec);
         di->i_atime_nsec = cpu_to_le32(inode->i_atime.tv_nsec);
         ocfs2_update_inode_fsync_trans(handle, inode, 0);
@@ -308,7 +308,7 @@ int ocfs2_set_inode_size(handle_t *handle,
 
         i_size_write(inode, new_i_size);
         inode->i_blocks = ocfs2_inode_sector_count(inode);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
 
         status = ocfs2_mark_inode_dirty(handle, inode, fe_bh);
         if (status < 0) {
@@ -429,7 +429,7 @@ static int ocfs2_orphan_for_truncate(struct ocfs2_super *osb,
         }
 
         i_size_write(inode, new_i_size);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
 
         di = (struct ocfs2_dinode *) fe_bh->b_data;
         di->i_size = cpu_to_le64(new_i_size);
@@ -840,7 +840,7 @@ static int ocfs2_write_zero_page(struct inode *inode, u64 abs_from,
         i_size_write(inode, abs_to);
         inode->i_blocks = ocfs2_inode_sector_count(inode);
         di->i_size = cpu_to_le64((u64)i_size_read(inode));
-        inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+        inode->i_mtime = inode->i_ctime = current_time(inode);
         di->i_mtime = di->i_ctime = cpu_to_le64(inode->i_mtime.tv_sec);
         di->i_ctime_nsec = cpu_to_le32(inode->i_mtime.tv_nsec);
         di->i_mtime_nsec = di->i_ctime_nsec;
@@ -1950,7 +1950,7 @@ static int __ocfs2_change_file_space(struct file *file, struct inode *inode,
         if (change_size && i_size_read(inode) < size)
                 i_size_write(inode, size);
 
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
         ret = ocfs2_mark_inode_dirty(handle, inode, di_bh);
         if (ret < 0)
                 mlog_errno(ret);