X-Git-Url: http://git.cascardo.info/?a=blobdiff_plain;f=fs%2Fudf%2Fnamei.c;h=17e9d4af301097a7a69dabdd1ad0f9249c25c1b2;hb=2773bf00aeb9bf39e022463272a61dd0ec9f55f4;hp=c3e5c96793715da0feb1b4cc861e0f74d952e988;hpb=c01f3f5c3c2860f90e7b1aa4c183ec6b7949fa87;p=cascardo%2Flinux.git

diff --git a/fs/udf/namei.c b/fs/udf/namei.c
index c3e5c9679371..17e9d4af3010 100644
--- a/fs/udf/namei.c
+++ b/fs/udf/namei.c
@@ -1093,7 +1093,8 @@ static int udf_link(struct dentry *old_dentry, struct inode *dir,
  * higher-level routines.
  */
 static int udf_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 *old_inode = d_inode(old_dentry);
 	struct inode *new_inode = d_inode(new_dentry);
@@ -1105,6 +1106,9 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry,
 	struct kernel_lb_addr tloc;
 	struct udf_inode_info *old_iinfo = UDF_I(old_inode);
 
+	if (flags & ~RENAME_NOREPLACE)
+		return -EINVAL;
+
 	ofi = udf_find_entry(old_dir, &old_dentry->d_name, &ofibh, &ocfi);
 	if (IS_ERR(ofi)) {
 		retval = PTR_ERR(ofi);