Revert "UBUNTU: SAUCE: aufs -- Add flags argument to aufs_rename()"

This reverts commit a58ac2e773eea792631f1923a0382c8fe9f3e39b.

Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c
index 8c763590aec1b35de9377653d5c7e054945db9ca..200b4d547240bee2003dc4a87976b7200c3e6b42 100644 (file)
--- a/fs/aufs/i_op_ren.c
+++ b/fs/aufs/i_op_ren.c
@@ -802,8 +802,7 @@ static void au_ren_rev_dt(int err, struct au_ren_args *a)
 /* ---------------------------------------------------------------------- */
 
 int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry,
-               struct inode *_dst_dir, struct dentry *_dst_dentry,
-               unsigned int rename_flags)
+               struct inode *_dst_dir, struct dentry *_dst_dentry)
 {
        int err, flags;
        /* reduce stack space */
@@ -813,10 +812,6 @@ int aufs_rename(struct inode *_src_dir, struct dentry *_src_dentry,
        IMustLock(_src_dir);
        IMustLock(_dst_dir);
 
-       err = -EINVAL;
-       if (rename_flags)
-               goto out;
-
        err = -ENOMEM;
        BUILD_BUG_ON(sizeof(*a) > PAGE_SIZE);
        a = kzalloc(sizeof(*a), GFP_NOFS);

diff --git a/fs/aufs/inode.h b/fs/aufs/inode.h
index 70b4ea8f815fa190d92a05659d149341b96d6613..94d217ff609a5dd9b67ac771536b31b807e9f09f 100644 (file)
--- a/fs/aufs/inode.h
+++ b/fs/aufs/inode.h
@@ -238,8 +238,7 @@ int aufs_rmdir(struct inode *dir, struct dentry *dentry);
 /* i_op_ren.c */
 int au_wbr(struct dentry *dentry, aufs_bindex_t btgt);
 int aufs_rename(struct inode *src_dir, struct dentry *src_dentry,
-               struct inode *dir, struct dentry *dentry,
-               unsigned int rename_flags);
+               struct inode *dir, struct dentry *dentry);
 
 /* iinfo.c */
 struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex);