LU-1187 mdt: unlink remote directory

[fs/lustre-release.git] / lustre / llite / namei.c

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index f52a890..9073f85 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -1127,6 +1127,7 @@ static int ll_rmdir_generic(struct inode *dir, struct dentry *dparent,
                 RETURN(PTR_ERR(op_data));
 
         ll_get_child_fid(dir, name, &op_data->op_fid3);
+       op_data->op_fid2 = op_data->op_fid3;
         rc = md_unlink(ll_i2sbi(dir)->ll_md_exp, op_data, &request);
         ll_finish_md_op_data(op_data);
         if (rc == 0) {
@@ -1270,11 +1271,12 @@ static int ll_unlink_generic(struct inode *dir, struct dentry *dparent,
         if (IS_ERR(op_data))
                 RETURN(PTR_ERR(op_data));
 
-        ll_get_child_fid(dir, name, &op_data->op_fid3);
-        rc = md_unlink(ll_i2sbi(dir)->ll_md_exp, op_data, &request);
-        ll_finish_md_op_data(op_data);
-        if (rc)
-                GOTO(out, rc);
+       ll_get_child_fid(dir, name, &op_data->op_fid3);
+       op_data->op_fid2 = op_data->op_fid3;
+       rc = md_unlink(ll_i2sbi(dir)->ll_md_exp, op_data, &request);
+       ll_finish_md_op_data(op_data);
+       if (rc)
+               GOTO(out, rc);
 
         ll_update_times(request, dir);
         ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_UNLINK, 1);