Merge remote-tracking branch 'ovl/rename2' into for-linus

[cascardo/linux.git] / fs / omfs / dir.c

diff --git a/fs/omfs/dir.c b/fs/omfs/dir.c
index 9a89164..b714652 100644 (file)
--- a/fs/omfs/dir.c
+++ b/fs/omfs/dir.c
@@ -371,12 +371,16 @@ static bool omfs_fill_chain(struct inode *dir, struct dir_context *ctx,
 }
 
 static int omfs_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 *new_inode = d_inode(new_dentry);
        struct inode *old_inode = d_inode(old_dentry);
        int err;
 
+       if (flags & ~RENAME_NOREPLACE)
+               return -EINVAL;
+
        if (new_inode) {
                /* overwriting existing file/dir */
                err = omfs_remove(new_dir, new_dentry);