X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fquota%2Fqsd_request.c;h=152ba905a45d0a7d1dbab6f198930cae59430897;hb=ae9d3bed51df1dfee7209ba2c2bc235504bc98d0;hp=be40e03ef30e292c4464d33df3d33944b424b1cc;hpb=0f8b7f951e7f43dbf389a431afea2091388a805e;p=fs%2Flustre-release.git diff --git a/lustre/quota/qsd_request.c b/lustre/quota/qsd_request.c index be40e03..152ba90 100644 --- a/lustre/quota/qsd_request.c +++ b/lustre/quota/qsd_request.c @@ -21,17 +21,13 @@ * GPL HEADER END */ /* - * Copyright (c) 2012, Intel Corporation. + * Copyright (c) 2012, 2016, Intel Corporation. * Use is subject to license terms. * * Author: Johann Lombardi * Author: Niu Yawei */ -#ifndef EXPORT_SYMTAB -# define EXPORT_SYMTAB -#endif - #define DEBUG_SUBSYSTEM S_LQUOTA #include @@ -117,6 +113,7 @@ int qsd_send_dqacq(const struct lu_env *env, struct obd_export *exp, GOTO(out, rc); } + req->rq_request_portal = MDS_READPAGE_PORTAL; req_qbody = req_capsule_client_get(&req->rq_pill, &RMF_QUOTA_BODY); *req_qbody = *qbody; @@ -136,7 +133,7 @@ int qsd_send_dqacq(const struct lu_env *env, struct obd_export *exp, ptlrpc_req_finished(req); } else { req->rq_interpret_reply = qsd_dqacq_interpret; - ptlrpcd_add_req(req, PDL_POLICY_LOCAL, -1); + ptlrpcd_add_req(req); } RETURN(rc); @@ -161,27 +158,41 @@ static int qsd_intent_interpret(const struct lu_env *env, { struct lustre_handle *lockh; struct quota_body *rep_qbody = NULL, *req_qbody; - struct ldlm_intent *lit; struct qsd_async_args *aa = (struct qsd_async_args *)arg; + struct ldlm_reply *lockrep; __u64 flags = LDLM_FL_HAS_INTENT; ENTRY; LASSERT(aa->aa_exp); lockh = &aa->aa_lockh; req_qbody = req_capsule_client_get(&req->rq_pill, &RMF_QUOTA_BODY); - lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT); + req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT); rc = ldlm_cli_enqueue_fini(aa->aa_exp, req, LDLM_PLAIN, 0, LCK_CR, &flags, (void *)aa->aa_lvb, sizeof(struct lquota_lvb), lockh, rc); - if (rc < 0) + if (rc < 0) { /* the lock has been destroyed, forget about the lock handle */ memset(lockh, 0, sizeof(*lockh)); + /* + * To avoid the server being fullfilled by LDLM locks, server + * may reject the locking request by returning -EINPROGRESS, + * this is different from the -EINPROGRESS returned by quota + * code. + */ + if (rc == -EINPROGRESS) + rc = -EAGAIN; + GOTO(out, rc); + } + + lockrep = req_capsule_server_get(&req->rq_pill, &RMF_DLM_REP); + LASSERT(lockrep != NULL); + rc = ptlrpc_status_ntoh(lockrep->lock_policy_res2); if (rc == 0 || rc == -EDQUOT || rc == -EINPROGRESS) rep_qbody = req_capsule_server_get(&req->rq_pill, &RMF_QUOTA_BODY); - +out: aa->aa_completion(env, aa->aa_qqi, req_qbody, rep_qbody, lockh, aa->aa_lvb, aa->aa_arg, rc); RETURN(rc); @@ -235,6 +246,7 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp, ptlrpc_request_free(req); GOTO(out, rc); } + req->rq_request_portal = MDS_READPAGE_PORTAL; lit = req_capsule_client_get(&req->rq_pill, &RMF_LDLM_INTENT); lit->opc = (__u64)it_op; @@ -260,15 +272,15 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp, break; case IT_QUOTA_DQACQ: /* build resource name associated for per-ID quota lock */ - fid_build_quota_resid(&qbody->qb_fid, &qbody->qb_id, - &qti->qti_resid); + fid_build_quota_res_name(&qbody->qb_fid, &qbody->qb_id, + &qti->qti_resid); /* copy einfo template and fill ei_cbdata with lqe pointer */ memcpy(&qti->qti_einfo, &qsd_id_einfo, sizeof(qti->qti_einfo)); qti->qti_einfo.ei_cbdata = arg; break; default: - LASSERTF(0, "invalid it_op %d", it_op); + LASSERTF(0, "invalid it_op %d\n", it_op); } /* build lock enqueue request */ @@ -285,15 +297,17 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp, case IT_QUOTA_CONN: /* grab reference on qqi for new lock */ #ifdef USE_LU_REF + { struct ldlm_lock *lock; lock = ldlm_handle2lock(&qti->qti_lockh); if (lock == NULL) { ptlrpc_req_finished(req); - GOTO(out, -ENOLCK); + GOTO(out, rc = -ENOLCK); } lu_ref_add(&qqi->qqi_reference, "glb_lock", lock); LDLM_LOCK_PUT(lock); + } #endif qqi_getref(qqi); break; @@ -325,7 +339,7 @@ int qsd_intent_lock(const struct lu_env *env, struct obd_export *exp, } else { /* queue lock request and return */ req->rq_interpret_reply = qsd_intent_interpret; - ptlrpcd_add_req(req, PDL_POLICY_LOCAL, -1); + ptlrpcd_add_req(req); } RETURN(rc); @@ -350,7 +364,7 @@ out: */ int qsd_fetch_index(const struct lu_env *env, struct obd_export *exp, struct idx_info *ii, unsigned int npages, - cfs_page_t **pages, bool *need_swab) + struct page **pages, bool *need_swab) { struct ptlrpc_request *req; struct idx_info *req_ii; @@ -374,16 +388,17 @@ int qsd_fetch_index(const struct lu_env *env, struct obd_export *exp, ptlrpc_at_set_req_timeout(req); /* allocate bulk descriptor */ - desc = ptlrpc_prep_bulk_imp(req, npages, 1, BULK_PUT_SINK, - MDS_BULK_PORTAL); - if (desc == NULL) { - ptlrpc_request_free(req); - RETURN(-ENOMEM); - } + desc = ptlrpc_prep_bulk_imp(req, npages, 1, + PTLRPC_BULK_PUT_SINK | PTLRPC_BULK_BUF_KIOV, + MDS_BULK_PORTAL, + &ptlrpc_bulk_kiov_pin_ops); + if (desc == NULL) + GOTO(out, rc = -ENOMEM); /* req now owns desc and will free it when it gets freed */ for (i = 0; i < npages; i++) - ptlrpc_prep_bulk_page_pin(desc, pages[i], 0, CFS_PAGE_SIZE); + desc->bd_frag_ops->add_kiov_frag(desc, pages[i], 0, + PAGE_SIZE); /* pack index information in request */ req_ii = req_capsule_client_get(&req->rq_pill, &RMF_IDX_INFO);