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

5 files changed, 5 insertions, 6 deletions

diff --git a/fs/proc/base.c b/fs/proc/base.c
index 29fd7ef97be9..c2964d890c9a 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -1671,7 +1671,7 @@ struct inode *proc_pid_make_inode(struct super_block * sb, struct task_struct *t
         /* Common stuff */
         ei = PROC_I(inode);
         inode->i_ino = get_next_ino();
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         inode->i_op = &proc_def_inode_operations;
 
         /*
diff --git a/fs/proc/inode.c b/fs/proc/inode.c
index c1b72388e571..e69ebe648a34 100644
--- a/fs/proc/inode.c
+++ b/fs/proc/inode.c
@@ -68,7 +68,6 @@ static struct inode *proc_alloc_inode(struct super_block *sb)
         ei->sysctl_entry = NULL;
         ei->ns_ops = NULL;
         inode = &ei->vfs_inode;
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
         return inode;
 }
 
@@ -421,7 +420,7 @@ struct inode *proc_get_inode(struct super_block *sb, struct proc_dir_entry *de)
 
         if (inode) {
                 inode->i_ino = de->low_ino;
-                inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+                inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
                 PROC_I(inode)->pde = de;
 
                 if (is_empty_pde(de)) {
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c
index f908b78bce55..55313d994895 100644
--- a/fs/proc/proc_sysctl.c
+++ b/fs/proc/proc_sysctl.c
@@ -445,7 +445,7 @@ static struct inode *proc_sys_make_inode(struct super_block *sb,
         ei->sysctl = head;
         ei->sysctl_entry = table;
 
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         inode->i_mode = table->mode;
         if (!S_ISDIR(table->mode)) {
                 inode->i_mode |= S_IFREG;
diff --git a/fs/proc/self.c b/fs/proc/self.c
index b6a8d3529fea..40245954c450 100644
--- a/fs/proc/self.c
+++ b/fs/proc/self.c
@@ -56,7 +56,7 @@ int proc_setup_self(struct super_block *s)
                 struct inode *inode = new_inode_pseudo(s);
                 if (inode) {
                         inode->i_ino = self_inum;
-                        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+                        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
                         inode->i_mode = S_IFLNK | S_IRWXUGO;
                         inode->i_uid = GLOBAL_ROOT_UID;
                         inode->i_gid = GLOBAL_ROOT_GID;
diff --git a/fs/proc/thread_self.c b/fs/proc/thread_self.c
index e58a31e8fb2a..595b90a9766c 100644
--- a/fs/proc/thread_self.c
+++ b/fs/proc/thread_self.c
@@ -58,7 +58,7 @@ int proc_setup_thread_self(struct super_block *s)
                 struct inode *inode = new_inode_pseudo(s);
                 if (inode) {
                         inode->i_ino = thread_self_inum;
-                        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+                        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
                         inode->i_mode = S_IFLNK | S_IRWXUGO;
                         inode->i_uid = GLOBAL_ROOT_UID;
                         inode->i_gid = GLOBAL_ROOT_GID;