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

6 files changed, 21 insertions, 18 deletions

diff --git a/fs/jfs/acl.c b/fs/jfs/acl.c
index 3a1e1554a4e3..7bc186f4ed4d 100644
--- a/fs/jfs/acl.c
+++ b/fs/jfs/acl.c
@@ -81,7 +81,7 @@ static int __jfs_set_acl(tid_t tid, struct inode *inode, int type,
                         rc = posix_acl_update_mode(inode, &inode->i_mode, &acl);
                         if (rc)
                                 return rc;
-                        inode->i_ctime = CURRENT_TIME;
+                        inode->i_ctime = current_time(inode);
                         mark_inode_dirty(inode);
                 }
                 break;
diff --git a/fs/jfs/inode.c b/fs/jfs/inode.c
index ad3e7b1effc4..054cc761b426 100644
--- a/fs/jfs/inode.c
+++ b/fs/jfs/inode.c
@@ -403,7 +403,7 @@ void jfs_truncate_nolock(struct inode *ip, loff_t length)
                         break;
                 }
 
-                ip->i_mtime = ip->i_ctime = CURRENT_TIME;
+                ip->i_mtime = ip->i_ctime = current_time(ip);
                 mark_inode_dirty(ip);
 
                 txCommit(tid, 1, &ip, 0);
diff --git a/fs/jfs/jfs_inode.c b/fs/jfs/jfs_inode.c
index 5e33cb9a190d..375dd257a34f 100644
--- a/fs/jfs/jfs_inode.c
+++ b/fs/jfs/jfs_inode.c
@@ -131,7 +131,7 @@ struct inode *ialloc(struct inode *parent, umode_t mode)
         jfs_inode->mode2 |= inode->i_mode;
 
         inode->i_blocks = 0;
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME;
+        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         jfs_inode->otime = inode->i_ctime.tv_sec;
         inode->i_generation = JFS_SBI(sb)->gengen++;
 
diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index e420c6088336..b41596d71858 100644
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -162,7 +162,7 @@ static int jfs_create(struct inode *dip, struct dentry *dentry, umode_t mode,
 
         mark_inode_dirty(ip);
 
-        dip->i_ctime = dip->i_mtime = CURRENT_TIME;
+        dip->i_ctime = dip->i_mtime = current_time(dip);
 
         mark_inode_dirty(dip);
 
@@ -298,7 +298,7 @@ static int jfs_mkdir(struct inode *dip, struct dentry *dentry, umode_t mode)
 
         /* update parent directory inode */
         inc_nlink(dip);         /* for '..' from child directory */
-        dip->i_ctime = dip->i_mtime = CURRENT_TIME;
+        dip->i_ctime = dip->i_mtime = current_time(dip);
         mark_inode_dirty(dip);
 
         rc = txCommit(tid, 2, &iplist[0], 0);
@@ -406,7 +406,7 @@ static int jfs_rmdir(struct inode *dip, struct dentry *dentry)
         /* update parent directory's link count corresponding
          * to ".." entry of the target directory deleted
          */
-        dip->i_ctime = dip->i_mtime = CURRENT_TIME;
+        dip->i_ctime = dip->i_mtime = current_time(dip);
         inode_dec_link_count(dip);
 
         /*
@@ -528,7 +528,7 @@ static int jfs_unlink(struct inode *dip, struct dentry *dentry)
 
         ASSERT(ip->i_nlink);
 
-        ip->i_ctime = dip->i_ctime = dip->i_mtime = CURRENT_TIME;
+        ip->i_ctime = dip->i_ctime = dip->i_mtime = current_time(ip);
         mark_inode_dirty(dip);
 
         /* update target's inode */
@@ -838,8 +838,8 @@ static int jfs_link(struct dentry *old_dentry,
 
         /* update object inode */
         inc_nlink(ip);          /* for new link */
-        ip->i_ctime = CURRENT_TIME;
-        dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+        ip->i_ctime = current_time(ip);
+        dir->i_ctime = dir->i_mtime = current_time(dir);
         mark_inode_dirty(dir);
         ihold(ip);
 
@@ -1039,7 +1039,7 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
 
         mark_inode_dirty(ip);
 
-        dip->i_ctime = dip->i_mtime = CURRENT_TIME;
+        dip->i_ctime = dip->i_mtime = current_time(dip);
         mark_inode_dirty(dip);
         /*
          * commit update of parent directory and link object
@@ -1078,7 +1078,8 @@ static int jfs_symlink(struct inode *dip, struct dentry *dentry,
  * FUNCTION:    rename a file or directory
  */
 static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
-               struct inode *new_dir, struct dentry *new_dentry)
+                      struct inode *new_dir, struct dentry *new_dentry,
+                      unsigned int flags)
 {
         struct btstack btstack;
         ino_t ino;
@@ -1097,6 +1098,8 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         s64 new_size = 0;
         int commit_flag;
 
+        if (flags & ~RENAME_NOREPLACE)
+                return -EINVAL;
 
         jfs_info("jfs_rename: %pd %pd", old_dentry, new_dentry);
 
@@ -1215,7 +1218,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
                         tblk->xflag |= COMMIT_DELETE;
                         tblk->u.ip = new_ip;
                 } else {
-                        new_ip->i_ctime = CURRENT_TIME;
+                        new_ip->i_ctime = current_time(new_ip);
                         mark_inode_dirty(new_ip);
                 }
         } else {
@@ -1278,10 +1281,10 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
         /*
          * Update ctime on changed/moved inodes & mark dirty
          */
-        old_ip->i_ctime = CURRENT_TIME;
+        old_ip->i_ctime = current_time(old_ip);
         mark_inode_dirty(old_ip);
 
-        new_dir->i_ctime = new_dir->i_mtime = current_fs_time(new_dir->i_sb);
+        new_dir->i_ctime = new_dir->i_mtime = current_time(new_dir);
         mark_inode_dirty(new_dir);
 
         /* Build list of inodes modified by this transaction */
@@ -1293,7 +1296,7 @@ static int jfs_rename(struct inode *old_dir, struct dentry *old_dentry,
 
         if (old_dir != new_dir) {
                 iplist[ipcount++] = new_dir;
-                old_dir->i_ctime = old_dir->i_mtime = CURRENT_TIME;
+                old_dir->i_ctime = old_dir->i_mtime = current_time(old_dir);
                 mark_inode_dirty(old_dir);
         }
 
@@ -1426,7 +1429,7 @@ static int jfs_mknod(struct inode *dir, struct dentry *dentry,
 
         mark_inode_dirty(ip);
 
-        dir->i_ctime = dir->i_mtime = CURRENT_TIME;
+        dir->i_ctime = dir->i_mtime = current_time(dir);
 
         mark_inode_dirty(dir);
 
diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index cec8814a3b8b..85671f7f8518 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -830,7 +830,7 @@ out:
         if (inode->i_size < off+len-towrite)
                 i_size_write(inode, off+len-towrite);
         inode->i_version++;
-        inode->i_mtime = inode->i_ctime = CURRENT_TIME;
+        inode->i_mtime = inode->i_ctime = current_time(inode);
         mark_inode_dirty(inode);
         inode_unlock(inode);
         return len - towrite;
diff --git a/fs/jfs/xattr.c b/fs/jfs/xattr.c
index 0bf3c33aedff..c60f3d32ee91 100644
--- a/fs/jfs/xattr.c
+++ b/fs/jfs/xattr.c
@@ -658,7 +658,7 @@ static int ea_put(tid_t tid, struct inode *inode, struct ea_buffer *ea_buf,
         if (old_blocks)
                 dquot_free_block(inode, old_blocks);
 
-        inode->i_ctime = CURRENT_TIME;
+        inode->i_ctime = current_time(inode);
 
         return 0;
 }