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

2 files changed, 4 insertions, 4 deletions

diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c
index 61b21051bd5a..ca9cbd6362e0 100644
--- a/fs/autofs4/inode.c
+++ b/fs/autofs4/inode.c
@@ -359,7 +359,7 @@ struct inode *autofs4_get_inode(struct super_block *sb, umode_t mode)
                 inode->i_uid = d_inode(sb->s_root)->i_uid;
                 inode->i_gid = d_inode(sb->s_root)->i_gid;
         }
-        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+        inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
         inode->i_ino = get_next_ino();
 
         if (S_ISDIR(mode)) {
diff --git a/fs/autofs4/root.c b/fs/autofs4/root.c
index fa84bb8832e0..623510e84c96 100644
--- a/fs/autofs4/root.c
+++ b/fs/autofs4/root.c
@@ -591,7 +591,7 @@ static int autofs4_dir_symlink(struct inode *dir,
         if (p_ino && !IS_ROOT(dentry))
                 atomic_inc(&p_ino->count);
 
-        dir->i_mtime = CURRENT_TIME;
+        dir->i_mtime = current_time(dir);
 
         return 0;
 }
@@ -631,7 +631,7 @@ static int autofs4_dir_unlink(struct inode *dir, struct dentry *dentry)
         d_inode(dentry)->i_size = 0;
         clear_nlink(d_inode(dentry));
 
-        dir->i_mtime = CURRENT_TIME;
+        dir->i_mtime = current_time(dir);
 
         spin_lock(&sbi->lookup_lock);
         __autofs4_add_expiring(dentry);
@@ -762,7 +762,7 @@ static int autofs4_dir_mkdir(struct inode *dir,
         if (p_ino && !IS_ROOT(dentry))
                 atomic_inc(&p_ino->count);
         inc_nlink(dir);
-        dir->i_mtime = CURRENT_TIME;
+        dir->i_mtime = current_time(dir);
 
         return 0;
 }