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

[deliverable/linux.git] / fs / ceph / dir.c

diff --git a/fs/ceph/dir.c b/fs/ceph/dir.c
index df4b3e6fa56398d248d51e0b6215a1773dacc1ec..291a4d59c5f7a7117057c227bd9e25cc74d696e0 100644 (file)
--- a/fs/ceph/dir.c
+++ b/fs/ceph/dir.c
@@ -1061,7 +1061,8 @@ out:
 }
 
 static int ceph_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 ceph_fs_client *fsc = ceph_sb_to_client(old_dir->i_sb);
        struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -1069,6 +1070,9 @@ static int ceph_rename(struct inode *old_dir, struct dentry *old_dentry,
        int op = CEPH_MDS_OP_RENAME;
        int err;
 
+       if (flags)
+               return -EINVAL;
+
        if (ceph_snap(old_dir) != ceph_snap(new_dir))
                return -EXDEV;
        if (ceph_snap(old_dir) != CEPH_NOSNAP) {