X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=inline;f=lustre%2Fllite%2Fnamei.c;fp=lustre%2Fllite%2Fnamei.c;h=3409c16bd897a82b1555fbb8d5132cd28a64c5cb;hb=f75d2a1fc9b17b384bbcbc13bcb80ba10412cf29;hp=bcfdf377e0373d34fe5005749aaf2c131e5dedf9;hpb=bb60caa1c6e7c14c201916dc0423442d10c86a27;p=fs%2Flustre-release.git diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index bcfdf37..3409c16 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -661,7 +661,7 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request, struct mdt_body *body = req_capsule_server_get(pill, &RMF_MDT_BODY); - rc = ll_prep_inode(&inode, request, (*de)->d_sb, it); + rc = ll_prep_inode(&inode, &request->rq_pill, (*de)->d_sb, it); if (rc) RETURN(rc); @@ -801,7 +801,7 @@ static int ll_lookup_it_finish(struct ptlrpc_request *request, out: if (rc != 0 && it->it_op & IT_OPEN) { ll_intent_drop_lock(it); - ll_open_cleanup((*de)->d_sb, request); + ll_open_cleanup((*de)->d_sb, &request->rq_pill); } return rc; @@ -1262,10 +1262,10 @@ static struct inode *ll_create_node(struct inode *dir, struct lookup_intent *it) LASSERT(it_disposition(it, DISP_ENQ_CREATE_REF)); request = it->it_request; - it_clear_disposition(it, DISP_ENQ_CREATE_REF); - rc = ll_prep_inode(&inode, request, dir->i_sb, it); - if (rc) - GOTO(out, inode = ERR_PTR(rc)); + it_clear_disposition(it, DISP_ENQ_CREATE_REF); + rc = ll_prep_inode(&inode, &request->rq_pill, dir->i_sb, it); + if (rc) + GOTO(out, inode = ERR_PTR(rc)); /* Pause to allow for a race with concurrent access by fid */ OBD_FAIL_TIMEOUT(OBD_FAIL_LLITE_CREATE_NODE_PAUSE, cfs_fail_val); @@ -1498,7 +1498,7 @@ again: CFS_FAIL_TIMEOUT(OBD_FAIL_LLITE_NEWNODE_PAUSE, cfs_fail_val); - err = ll_prep_inode(&inode, request, dchild->d_sb, NULL); + err = ll_prep_inode(&inode, &request->rq_pill, dchild->d_sb, NULL); if (err) GOTO(err_exit, err);