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

1 files changed, 5 insertions, 1 deletions

diff --git a/fs/hfs/dir.c b/fs/hfs/dir.c
index 4f379fb91691..5de5c48b418d 100644
--- a/fs/hfs/dir.c
+++ b/fs/hfs/dir.c
@@ -286,10 +286,14 @@ static int hfs_remove(struct inode *dir, struct dentry *dentry)
  * XXX: how do you handle must_be dir?
  */
 static int hfs_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)) {
                 res = hfs_remove(new_dir, new_dentry);