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

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

diff --git a/fs/hfsplus/dir.c b/fs/hfsplus/dir.c
index 69c66c2..3cf0887 100644 (file)
--- a/fs/hfsplus/dir.c
+++ b/fs/hfsplus/dir.c
@@ -530,10 +530,14 @@ static int hfsplus_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode)
 }
 
 static int hfsplus_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)
 {
        int res;
 
+       if (flags & ~RENAME_NOREPLACE)
+               return -EINVAL;
+
        /* Unlink destination if it already exists */
        if (d_really_is_positive(new_dentry)) {
                if (d_is_dir(new_dentry))