Merge remote-tracking branch 'mailbox/mailbox-for-next'

[deliverable/linux.git] / fs / libfs.c

diff --git a/fs/libfs.c b/fs/libfs.c
index 74dc8b9e7f53ab394113783c96fb754c045735fa..4758353b2d41bb1b252afe6b2026f46bd5d44d5f 100644 (file)
--- a/fs/libfs.c
+++ b/fs/libfs.c
@@ -349,11 +349,15 @@ int simple_rmdir(struct inode *dir, struct dentry *dentry)
 EXPORT_SYMBOL(simple_rmdir);
 
 int simple_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 *inode = d_inode(old_dentry);
        int they_are_dirs = d_is_dir(old_dentry);
 
+       if (flags & ~RENAME_NOREPLACE)
+               return -EINVAL;
+
        if (!simple_empty(new_dentry))
                return -ENOTEMPTY;