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

4 files changed, 13 insertions, 9 deletions

diff --git a/fs/minix/bitmap.c b/fs/minix/bitmap.c
index 742942a983be..c2c3fd3277b5 100644
--- a/fs/minix/bitmap.c
+++ b/fs/minix/bitmap.c
@@ -253,7 +253,7 @@ struct inode *minix_new_inode(const struct inode *dir, umode_t mode, int *error)
         }
         inode_init_owner(inode, dir, mode);
         inode->i_ino = j;
-        inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode);
         inode->i_blocks = 0;
         memset(&minix_i(inode)->u, 0, sizeof(minix_i(inode)->u));
         insert_inode_hash(inode);
diff --git a/fs/minix/dir.c b/fs/minix/dir.c
index 31dcd515b9d5..7edc9b395700 100644
--- a/fs/minix/dir.c
+++ b/fs/minix/dir.c
@@ -274,7 +274,7 @@ got_it:
                 de->inode = inode->i_ino;
         }
         err = dir_commit_chunk(page, pos, sbi->s_dirsize);
-        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+        dir->i_mtime = dir->i_ctime = current_time(dir);
         mark_inode_dirty(dir);
 out_put:
         dir_put_page(page);
@@ -306,7 +306,7 @@ int minix_delete_entry(struct minix_dir_entry *de, struct page *page)
                 unlock_page(page);
         }
         dir_put_page(page);
-        inode->i_ctime = inode->i_mtime = CURRENT_TIME_SEC;
+        inode->i_ctime = inode->i_mtime = current_time(inode);
         mark_inode_dirty(inode);
         return err;
 }
@@ -430,7 +430,7 @@ void minix_set_link(struct minix_dir_entry *de, struct page *page,
                 unlock_page(page);
         }
         dir_put_page(page);
-        dir->i_mtime = dir->i_ctime = CURRENT_TIME_SEC;
+        dir->i_mtime = dir->i_ctime = current_time(dir);
         mark_inode_dirty(dir);
 }
 
diff --git a/fs/minix/itree_common.c b/fs/minix/itree_common.c
index a731cabf1540..4c57c9af6946 100644
--- a/fs/minix/itree_common.c
+++ b/fs/minix/itree_common.c
@@ -124,7 +124,7 @@ static inline int splice_branch(struct inode *inode,
 
         /* We are done with atomic stuff, now do the rest of housekeeping */
 
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
 
         /* had we spliced it onto indirect block? */
         if (where->bh)
@@ -343,7 +343,7 @@ do_indirects:
                 }
                 first_whole++;
         }
-        inode->i_mtime = inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_mtime = inode->i_ctime = current_time(inode);
         mark_inode_dirty(inode);
 }
 
diff --git a/fs/minix/namei.c b/fs/minix/namei.c
index 2887d1d95ce2..1e0f11f5dac9 100644
--- a/fs/minix/namei.c
+++ b/fs/minix/namei.c
@@ -106,7 +106,7 @@ static int minix_link(struct dentry * old_dentry, struct inode * dir,
 {
         struct inode *inode = d_inode(old_dentry);
 
-        inode->i_ctime = CURRENT_TIME_SEC;
+        inode->i_ctime = current_time(inode);
         inode_inc_link_count(inode);
         ihold(inode);
         return add_nondir(dentry, inode);
@@ -185,7 +185,8 @@ static int minix_rmdir(struct inode * dir, struct dentry *dentry)
 }
 
 static int minix_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 inode * old_inode = d_inode(old_dentry);
         struct inode * new_inode = d_inode(new_dentry);
@@ -195,6 +196,9 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
         struct minix_dir_entry * old_de;
         int err = -ENOENT;
 
+        if (flags & ~RENAME_NOREPLACE)
+                return -EINVAL;
+
         old_de = minix_find_entry(old_dentry, &old_page);
         if (!old_de)
                 goto out;
@@ -219,7 +223,7 @@ static int minix_rename(struct inode * old_dir, struct dentry *old_dentry,
                 if (!new_de)
                         goto out_dir;
                 minix_set_link(new_de, new_page, old_inode);
-                new_inode->i_ctime = CURRENT_TIME_SEC;
+                new_inode->i_ctime = current_time(new_inode);
                 if (dir_de)
                         drop_nlink(new_inode);
                 inode_dec_link_count(new_inode);