Merge remote-tracking branch 'staging/staging-next'

[deliverable/linux.git] / drivers / staging / lustre / lustre / llite / namei.c

diff --git a/drivers/staging/lustre/lustre/llite/namei.c b/drivers/staging/lustre/lustre/llite/namei.c
index b7d448ffc8eb459624980e1ee6c9b3ad035f5952..a28a40c4ccbf635004668732109a53ade7fd49d9 100644 (file)
--- a/drivers/staging/lustre/lustre/llite/namei.c
+++ b/drivers/staging/lustre/lustre/llite/namei.c
@@ -1107,13 +1107,17 @@ out:
 }
 
 static int ll_rename(struct inode *src, struct dentry *src_dchild,
-                    struct inode *tgt, struct dentry *tgt_dchild)
+                    struct inode *tgt, struct dentry *tgt_dchild,
+                    unsigned int flags)
 {
        struct ptlrpc_request *request = NULL;
        struct ll_sb_info *sbi = ll_i2sbi(src);
        struct md_op_data *op_data;
        int err;
 
+       if (flags)
+               return -EINVAL;
+
        CDEBUG(D_VFSTRACE,
               "VFS Op:oldname=%pd, src_dir="DFID"(%p), newname=%pd, tgt_dir="DFID"(%p)\n",
               src_dchild, PFID(ll_inode2fid(src)), src,
@@ -1159,7 +1163,7 @@ const struct inode_operations ll_dir_inode_operations = {
        .rmdir        = ll_rmdir,
        .symlink            = ll_symlink,
        .link          = ll_link,
-       .rename      = ll_rename,
+       .rename         = ll_rename,
        .setattr            = ll_setattr,
        .getattr            = ll_getattr,
        .permission      = ll_inode_permission,