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, 11 insertions, 11 deletions

diff --git a/mm/shmem.c b/mm/shmem.c
index 8596217b5e26..ad7813d73ea7 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -934,7 +934,7 @@ static void shmem_undo_range(struct inode *inode, loff_t lstart, loff_t lend,
 void shmem_truncate_range(struct inode *inode, loff_t lstart, loff_t lend)
 {
         shmem_undo_range(inode, lstart, lend, false);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
 }
 EXPORT_SYMBOL_GPL(shmem_truncate_range);
 
@@ -979,7 +979,7 @@ static int shmem_setattr(struct dentry *dentry, struct iattr *attr)
                         if (error)
                                 return error;
                         i_size_write(inode, newsize);
-                        inode->i_ctime = inode->i_mtime = CURRENT_TIME;
+                        inode->i_ctime = inode->i_mtime = current_time(inode);
                 }
                 if (newsize <= oldsize) {
                         loff_t holebegin = round_up(newsize, PAGE_SIZE);
@@ -2083,7 +2083,7 @@ static struct inode *shmem_get_inode(struct super_block *sb, const struct inode
                 inode->i_ino = get_next_ino();
                 inode_init_owner(inode, dir, mode);
                 inode->i_blocks = 0;
-                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_generation = get_seconds();
                 info = SHMEM_I(inode);
                 memset(info, 0, (char *)inode - (char *)info);
@@ -2741,7 +2741,7 @@ static long shmem_fallocate(struct file *file, int mode, loff_t offset,
 
         if (!(mode & FALLOC_FL_KEEP_SIZE) && offset + len > inode->i_size)
                 i_size_write(inode, offset + len);
-        inode->i_ctime = CURRENT_TIME;
+        inode->i_ctime = current_time(inode);
 undone:
         spin_lock(&inode->i_lock);
         inode->i_private = NULL;
@@ -2794,7 +2794,7 @@ shmem_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, dev_t dev)
 
                 error = 0;
                 dir->i_size += BOGO_DIRENT_SIZE;
-                dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+                dir->i_ctime = dir->i_mtime = current_time(dir);
                 d_instantiate(dentry, inode);
                 dget(dentry); /* Extra count - pin the dentry in core */
         }
@@ -2862,7 +2862,7 @@ static int shmem_link(struct dentry *old_dentry, struct inode *dir, struct dentr
                 goto out;
 
         dir->i_size += BOGO_DIRENT_SIZE;
-        inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+        inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode);
         inc_nlink(inode);
         ihold(inode);   /* New dentry reference */
         dget(dentry);           /* Extra pinning count for the created dentry */
@@ -2879,7 +2879,7 @@ static int shmem_unlink(struct inode *dir, struct dentry *dentry)
                 shmem_free_inode(inode->i_sb);
 
         dir->i_size -= BOGO_DIRENT_SIZE;
-        inode->i_ctime = dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+        inode->i_ctime = dir->i_ctime = dir->i_mtime = current_time(inode);
         drop_nlink(inode);
         dput(dentry);   /* Undo the count from "create" - this does all the work */
         return 0;
@@ -2912,7 +2912,7 @@ static int shmem_exchange(struct inode *old_dir, struct dentry *old_dentry, stru
         old_dir->i_ctime = old_dir->i_mtime =
         new_dir->i_ctime = new_dir->i_mtime =
         d_inode(old_dentry)->i_ctime =
-        d_inode(new_dentry)->i_ctime = CURRENT_TIME;
+        d_inode(new_dentry)->i_ctime = current_time(old_dir);
 
         return 0;
 }
@@ -2986,7 +2986,7 @@ static int shmem_rename2(struct inode *old_dir, struct dentry *old_dentry, struc
         new_dir->i_size += BOGO_DIRENT_SIZE;
         old_dir->i_ctime = old_dir->i_mtime =
         new_dir->i_ctime = new_dir->i_mtime =
-        inode->i_ctime = CURRENT_TIME;
+        inode->i_ctime = current_time(old_dir);
         return 0;
 }
 
@@ -3041,7 +3041,7 @@ static int shmem_symlink(struct inode *dir, struct dentry *dentry, const char *s
                 put_page(page);
         }
         dir->i_size += BOGO_DIRENT_SIZE;
-        dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+        dir->i_ctime = dir->i_mtime = current_time(dir);
         d_instantiate(dentry, inode);
         dget(dentry);
         return 0;
@@ -3692,7 +3692,7 @@ static const struct inode_operations shmem_dir_inode_operations = {
         .mkdir          = shmem_mkdir,
         .rmdir          = shmem_rmdir,
         .mknod          = shmem_mknod,
-        .rename2        = shmem_rename2,
+        .rename         = shmem_rename2,
         .tmpfile        = shmem_tmpfile,
 #endif
 #ifdef CONFIG_TMPFS_XATTR