From: Arshad Hussain Date: Thu, 2 May 2024 10:49:26 +0000 (-0400) Subject: LU-16741 mdc: rename ptlrpc_req_finished for component mdc X-Git-Tag: 2.15.64~203 X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=daf1283efb3a6f903f31762dd48d13af429168ec;p=fs%2Flustre-release.git LU-16741 mdc: rename ptlrpc_req_finished for component mdc Patch renames ptlrpc_req_finished to ptlrpc_req_put for mdc component Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: I46de8facbafcabbeb5c12daefcc5172f6c9bafd5 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54987 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Reviewed-by: Oleg Drokin --- diff --git a/lustre/mdc/mdc_dev.c b/lustre/mdc/mdc_dev.c index 13d1cb5..6cf3fa3 100644 --- a/lustre/mdc/mdc_dev.c +++ b/lustre/mdc/mdc_dev.c @@ -827,14 +827,14 @@ static int mdc_enqueue_send(const struct lu_env *env, struct obd_export *exp, req->rq_interpret_reply = mdc_enqueue_interpret; ptlrpcd_add_req(req); } else { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); } RETURN(rc); } rc = mdc_enqueue_fini(exp, req, upcall, cookie, &lockh, einfo->ei_mode, flags, rc); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } diff --git a/lustre/mdc/mdc_locks.c b/lustre/mdc/mdc_locks.c index 55f34f6..2aedd96 100644 --- a/lustre/mdc/mdc_locks.c +++ b/lustre/mdc/mdc_locks.c @@ -1115,7 +1115,7 @@ resend: * (explicits or automatically generated by kernel to clean * current flocks upon exit) that can't be trashed. */ - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (((rc == -EINTR) || (rc == -ETIMEDOUT)) && (einfo->ei_type == LDLM_FLOCK) && (einfo->ei_mode == LCK_NL)) @@ -1130,7 +1130,7 @@ resend: PFID(&op_data->op_fid2), op_data->op_name ?: "", rc); mdc_clear_replay_flag(req, rc); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } @@ -1146,7 +1146,7 @@ resend: */ if (it && (int)lockrep->lock_policy_res2 == -EINPROGRESS) { mdc_clear_replay_flag(req, rc); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (generation == obd->u.cli.cl_import->imp_generation) { if (signal_pending(current)) RETURN(-EINTR); @@ -1167,7 +1167,7 @@ resend: it->it_op & (IT_OPEN | IT_GETATTR | IT_LOOKUP) && acl_bufsize == LUSTRE_POSIX_ACL_MAX_SIZE_OLD) { mdc_clear_replay_flag(req, -ERANGE); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); acl_bufsize = min_t(__u32, imp->imp_connect_data.ocd_max_easize, XATTR_SIZE_MAX); goto resend; @@ -1179,7 +1179,7 @@ resend: ldlm_lock_decref(lockh, einfo->ei_mode); memset(lockh, 0, sizeof(*lockh)); } - ptlrpc_req_finished(req); + ptlrpc_req_put(req); it->it_lock_handle = 0; it->it_lock_mode = 0; @@ -1553,7 +1553,7 @@ int mdc_intent_getattr_async(struct obd_export *exp, rc = ldlm_cli_enqueue(exp, &req, &item->mop_einfo, &res_id, &policy, &flags, NULL, 0, LVB_T_NONE, &item->mop_lockh, 1); if (rc < 0) { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } diff --git a/lustre/mdc/mdc_reint.c b/lustre/mdc/mdc_reint.c index 6619e55..72a4e06 100644 --- a/lustre/mdc/mdc_reint.c +++ b/lustre/mdc/mdc_reint.c @@ -259,7 +259,7 @@ rebuild: } else if (rc == -EINPROGRESS) { /* Retry create infinitely until succeed or get other * error code or interrupted. */ - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (generation == import->imp_generation) { if (signal_pending(current)) RETURN(-EINTR); @@ -601,6 +601,6 @@ int mdc_file_resync(struct obd_export *exp, struct md_op_data *op_data) if (rc == -ERESTARTSYS) rc = 0; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } diff --git a/lustre/mdc/mdc_request.c b/lustre/mdc/mdc_request.c index 52d6d3d..a6bc5f0 100644 --- a/lustre/mdc/mdc_request.c +++ b/lustre/mdc/mdc_request.c @@ -147,7 +147,7 @@ static int mdc_get_root(struct obd_export *exp, const char *fileset, PFID(rootfid), lustre_msg_get_last_committed(req->rq_repmsg)); EXIT; out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -273,7 +273,7 @@ again: goto again; } - ptlrpc_req_finished(req); + ptlrpc_req_put(req); } else { *request = req; } @@ -339,7 +339,7 @@ again: goto again; } - ptlrpc_req_finished(req); + ptlrpc_req_put(req); } else { *request = req; } @@ -460,7 +460,7 @@ static int mdc_xattr_common(struct obd_export *exp,const struct req_format *fmt, ptlrpc_put_mod_rpc_slot(req); if (rc) - ptlrpc_req_finished(req); + ptlrpc_req_put(req); else *request = req; RETURN(rc); @@ -543,7 +543,7 @@ static int mdc_getxattr(struct obd_export *exp, const struct lu_fid *fid, GOTO(out, rc = body->mbo_eadatasize); out: if (rc < 0) { - ptlrpc_req_finished(*req); + ptlrpc_req_put(*req); *req = NULL; } @@ -1055,7 +1055,7 @@ restart_bulk: MDS_BULK_PORTAL, &ptlrpc_bulk_kiov_pin_ops); if (desc == NULL) { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(-ENOMEM); } @@ -1069,7 +1069,7 @@ restart_bulk: ptlrpc_request_set_replen(req); rc = ptlrpc_queue_wait(req); if (rc) { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (rc != -ETIMEDOUT) RETURN(rc); @@ -1092,7 +1092,7 @@ restart_bulk: rc = sptlrpc_cli_unwrap_bulk_read(req, req->rq_bulk, req->rq_bulk->bd_nob_transferred); if (rc < 0) { - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } @@ -1100,7 +1100,7 @@ restart_bulk: CERROR("%s: unexpected bytes transferred: %d (%ld expected)\n", exp->exp_obd->obd_name, req->rq_bulk->bd_nob_transferred, PAGE_SIZE * npages); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(-EPROTO); } @@ -1372,7 +1372,7 @@ static int ll_mdc_read_page_remote(void *data, struct page *page0) } unlock_page(page0); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); CDEBUG(D_CACHE, "read %d/%d pages\n", rd_pgs, npages); for (i = 1; i < npages; i++) { unsigned long offset; @@ -1462,7 +1462,7 @@ static int mdc_read_page(struct obd_export *exp, struct md_op_data *op_data, rc = mdc_intent_lock(exp, op_data, &it, &enq_req, mrinfo->mr_blocking_ast, 0); if (enq_req != NULL) - ptlrpc_req_finished(enq_req); + ptlrpc_req_put(enq_req); if (rc < 0) { CERROR("%s: "DFID" lock enqueue fails: rc = %d\n", @@ -1681,7 +1681,7 @@ static int mdc_statfs(const struct lu_env *env, *osfs = *msfs; EXIT; out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); output: class_import_put(imp); return rc; @@ -1766,7 +1766,7 @@ static int mdc_ioc_hsm_progress(struct obd_export *exp, GOTO(out, rc); out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -1823,7 +1823,7 @@ static int mdc_ioc_hsm_ct_register(struct obd_import *imp, __u32 archive_count, rc = mdc_queue_wait(req); GOTO(out, rc); out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -1865,7 +1865,7 @@ static int mdc_ioc_hsm_current_action(struct obd_export *exp, EXIT; out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -1888,7 +1888,7 @@ static int mdc_ioc_hsm_ct_unregister(struct obd_import *imp) rc = mdc_queue_wait(req); GOTO(out, rc); out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -1929,7 +1929,7 @@ static int mdc_ioc_hsm_state_get(struct obd_export *exp, EXIT; out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -1970,7 +1970,7 @@ static int mdc_ioc_hsm_state_set(struct obd_export *exp, GOTO(out, rc); out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -2062,7 +2062,7 @@ static int mdc_ioc_hsm_request(struct obd_export *exp, GOTO(out, rc); out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -2159,7 +2159,7 @@ static int mdc_quotactl(struct obd_device *unused, struct obd_export *exp, exp->exp_obd->obd_name, rc); } out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } @@ -2216,7 +2216,7 @@ static int mdc_ioc_swap_layouts(struct obd_export *exp, EXIT; out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -2402,7 +2402,7 @@ static int mdc_get_info_rpc(struct obd_export *exp, lustre_swab_fid2path(val); } } - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } @@ -2700,7 +2700,7 @@ static int mdc_fsync(struct obd_export *exp, const struct lu_fid *fid, rc = ptlrpc_queue_wait(req); if (rc) - ptlrpc_req_finished(req); + ptlrpc_req_put(req); else *request = req; RETURN(rc);