This reverts commit ad8dbc93a464869f64365a2123b3491965df3b3e.

The original commit was reverted in Lustre tree this due to
interoperability problems with 2.1 servers. But I forgot to remove
it from my patch queue. sorry for the noise.

Cc: Patrick Farrell <[email protected]>
Cc: Andreas Dilger <[email protected]>
Signed-off-by: Peng Tao <[email protected]>
---
 drivers/staging/lustre/lustre/llite/file.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/lustre/lustre/llite/file.c 
b/drivers/staging/lustre/lustre/llite/file.c
index f36c5d8..82248e9 100644
--- a/drivers/staging/lustre/lustre/llite/file.c
+++ b/drivers/staging/lustre/lustre/llite/file.c
@@ -368,6 +368,8 @@ static int ll_intent_file_open(struct file *file, void *lmm,
 {
        struct ll_sb_info *sbi = ll_i2sbi(file->f_dentry->d_inode);
        struct dentry *parent = file->f_dentry->d_parent;
+       const char *name = file->f_dentry->d_name.name;
+       const int len = file->f_dentry->d_name.len;
        struct md_op_data *op_data;
        struct ptlrpc_request *req;
        __u32 opc = LUSTRE_OPC_ANY;
@@ -392,9 +394,8 @@ static int ll_intent_file_open(struct file *file, void *lmm,
        }
 
        op_data  = ll_prep_md_op_data(NULL, parent->d_inode,
-                                     file->f_dentry->d_inode, NULL, 0,
+                                     file->f_dentry->d_inode, name, len,
                                      O_RDWR, opc, NULL);
-
        if (IS_ERR(op_data))
                return PTR_ERR(op_data);
 
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to