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

diff --git a/fs/gfs2/inode.c b/fs/gfs2/inode.c
index f6c4f0058899..fe3f84995c48 100644
--- a/fs/gfs2/inode.c
+++ b/fs/gfs2/inode.c
@@ -656,7 +656,7 @@ static int gfs2_create_inode(struct inode *dir, struct dentry *dentry,
         set_nlink(inode, S_ISDIR(mode) ? 2 : 1);
         inode->i_rdev = dev;
         inode->i_size = size;
-        inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+        inode->i_atime = inode->i_mtime = inode->i_ctime = current_time(inode);
         gfs2_set_inode_blocks(inode, 1);
         munge_mode_uid_gid(dip, inode);
         check_and_update_goal(dip);
@@ -983,7 +983,7 @@ static int gfs2_link(struct dentry *old_dentry, struct inode *dir,
 
         gfs2_trans_add_meta(ip->i_gl, dibh);
         inc_nlink(&ip->i_inode);
-        ip->i_inode.i_ctime = CURRENT_TIME;
+        ip->i_inode.i_ctime = current_time(&ip->i_inode);
         ihold(inode);
         d_instantiate(dentry, inode);
         mark_inode_dirty(inode);
@@ -1067,7 +1067,7 @@ static int gfs2_unlink_inode(struct gfs2_inode *dip,
                 return error;
 
         ip->i_entries = 0;
-        inode->i_ctime = CURRENT_TIME;
+        inode->i_ctime = current_time(inode);
         if (S_ISDIR(inode->i_mode))
                 clear_nlink(inode);
         else
@@ -1330,7 +1330,7 @@ static int update_moved_ino(struct gfs2_inode *ip, struct gfs2_inode *ndip,
         error = gfs2_meta_inode_buffer(ip, &dibh);
         if (error)
                 return error;
-        ip->i_inode.i_ctime = CURRENT_TIME;
+        ip->i_inode.i_ctime = current_time(&ip->i_inode);
         gfs2_trans_add_meta(ip->i_gl, dibh);
         gfs2_dinode_out(ip, dibh->b_data);
         brelse(dibh);
@@ -2055,7 +2055,7 @@ const struct inode_operations gfs2_dir_iops = {
         .mkdir = gfs2_mkdir,
         .rmdir = gfs2_unlink,
         .mknod = gfs2_mknod,
-        .rename2 = gfs2_rename2,
+        .rename = gfs2_rename2,
         .permission = gfs2_permission,
         .setattr = gfs2_setattr,
         .getattr = gfs2_getattr,