fs: support RENAME_NOREPLACE for local filesystems

[cascardo/linux.git] / fs / jfs / namei.c

diff --git a/fs/jfs/namei.c b/fs/jfs/namei.c
index 814b0c5..ee1aa32 100644 (file)
--- a/fs/jfs/namei.c
+++ b/fs/jfs/namei.c
@@ -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);
 
@@ -1536,7 +1539,7 @@ const struct inode_operations jfs_dir_inode_operations = {
        .mkdir          = jfs_mkdir,
        .rmdir          = jfs_rmdir,
        .mknod          = jfs_mknod,
-       .rename         = jfs_rename,
+       .rename2        = jfs_rename,
        .setxattr       = generic_setxattr,
        .getxattr       = generic_getxattr,
        .listxattr      = jfs_listxattr,