From 05da63d18c4fd6506197f284473060a0329ee7ac Mon Sep 17 00:00:00 2001 From: Arshad Hussain Date: Thu, 2 May 2024 06:18:09 -0400 Subject: [PATCH] LU-16741 llite: rename ptlrpc_req_finished for component llite Patch renames ptlrpc_req_finished to ptlrpc_req_put for llite component Test-Parameters: trivial Signed-off-by: Arshad Hussain Change-Id: I216aa2797fbebeecae82b1d45301df7a860bde65 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54985 Tested-by: jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Patrick Farrell Reviewed-by: Oleg Drokin --- lustre/llite/acl.c | 2 +- lustre/llite/crypto.c | 2 +- lustre/llite/dcache.c | 4 ++-- lustre/llite/dir.c | 10 +++++----- lustre/llite/file.c | 24 ++++++++++++------------ lustre/llite/llite_lib.c | 20 ++++++++++---------- lustre/llite/llite_nfs.c | 4 ++-- lustre/llite/namei.c | 24 ++++++++++++------------ lustre/llite/statahead.c | 2 +- lustre/llite/symlink.c | 8 ++++---- lustre/llite/xattr.c | 8 ++++---- lustre/llite/xattr_cache.c | 4 ++-- 12 files changed, 56 insertions(+), 56 deletions(-) diff --git a/lustre/llite/acl.c b/lustre/llite/acl.c index c5c15e7..d3a8a91 100644 --- a/lustre/llite/acl.c +++ b/lustre/llite/acl.c @@ -125,7 +125,7 @@ int ll_set_acl(struct mnt_idmap *map, if (!rc) ll_i2info(inode)->lli_synced_to_mds = false; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); out_value: kfree(value); out: diff --git a/lustre/llite/crypto.c b/lustre/llite/crypto.c index 7c87e08..3b295ce 100644 --- a/lustre/llite/crypto.c +++ b/lustre/llite/crypto.c @@ -113,7 +113,7 @@ static int ll_set_context(struct inode *inode, const void *ctx, size_t len, ctx, len, XATTR_CREATE, ll_i2suppgid(inode), &req); if (rc) return rc; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return ll_set_encflags(inode, (void *)ctx, len, false); } diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c index 83cfc6f..be875bf 100644 --- a/lustre/llite/dcache.c +++ b/lustre/llite/dcache.c @@ -219,10 +219,10 @@ void ll_intent_release(struct lookup_intent *it) ll_intent_drop_lock(it); /* We are still holding extra reference on a request, need to free it */ if (it_disposition(it, DISP_ENQ_OPEN_REF)) - ptlrpc_req_finished(it->it_request); /* ll_file_open */ + ptlrpc_req_put(it->it_request); /* ll_file_open */ if (it_disposition(it, DISP_ENQ_CREATE_REF)) /* create rec */ - ptlrpc_req_finished(it->it_request); + ptlrpc_req_put(it->it_request); it->it_disposition = 0; it->it_request = NULL; diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c index 3c68ef5..9492ffd 100644 --- a/lustre/llite/dir.c +++ b/lustre/llite/dir.c @@ -587,7 +587,7 @@ static int ll_dir_setdirstripe(struct dentry *dparent, struct lmv_user_md *lump, out_inode: iput(inode); out_request: - ptlrpc_req_finished(request); + ptlrpc_req_put(request); out_op_data: ll_finish_md_op_data(op_data); @@ -674,7 +674,7 @@ int ll_dir_setstripe(struct inode *inode, struct lov_user_md *lump, /* swabbing is done in lov_setstripe() on server side */ rc = md_setattr(sbi->ll_md_exp, op_data, lump, lum_size, &req); ll_finish_md_op_data(op_data); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (rc) RETURN(rc); @@ -2247,7 +2247,7 @@ out: out_tmp: OBD_FREE(tmp, lum_size); finish_req: - ptlrpc_req_finished(request); + ptlrpc_req_put(request); return rc; } case LL_IOC_REMOVE_ENTRY: { @@ -2476,8 +2476,8 @@ out_rmdir: EXIT; out_req: - ptlrpc_req_finished(request); - ptlrpc_req_finished(root_request); + ptlrpc_req_put(request); + ptlrpc_req_put(root_request); if (filename) ll_putname(filename); return rc; diff --git a/lustre/llite/file.c b/lustre/llite/file.c index 4663a5a..acda0df 100644 --- a/lustre/llite/file.c +++ b/lustre/llite/file.c @@ -283,7 +283,7 @@ out: och->och_open_handle.cookie = DEAD_HANDLE_MAGIC; OBD_FREE_PTR(och); - ptlrpc_req_finished(req); /* This is close request */ + ptlrpc_req_put(req); /* This is close request */ return rc; } @@ -743,7 +743,7 @@ retry: ll_update_dir_depth_dmv(parent->d_inode, de); out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); ll_intent_drop_lock(itp); /* We did open by fid, but by the time we got to the server, the object @@ -1085,7 +1085,7 @@ out_openerr: out_nofiledata: if (it && it_disposition(it, DISP_ENQ_OPEN_REF)) { - ptlrpc_req_finished(it->it_request); + ptlrpc_req_put(it->it_request); it_clear_disposition(it, DISP_ENQ_OPEN_REF); } @@ -1260,7 +1260,7 @@ ll_lease_open(struct inode *inode, struct file *file, fmode_t fmode, */ LDLM_FL_NO_LRU | LDLM_FL_EXCL); ll_finish_md_op_data(op_data); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (rc < 0) GOTO(out_release_it, rc); @@ -3121,7 +3121,7 @@ int ll_release_openhandle(struct dentry *dentry, struct lookup_intent *it) out: /* this one is in place of ll_file_open */ if (it_disposition(it, DISP_ENQ_OPEN_REF)) { - ptlrpc_req_finished(it->it_request); + ptlrpc_req_put(it->it_request); it_clear_disposition(it, DISP_ENQ_OPEN_REF); } RETURN(rc); @@ -4096,7 +4096,7 @@ int ll_set_project(struct inode *inode, __u32 xflags, __u32 projid) op_data->op_xvalid |= OP_XVALID_PROJID | OP_XVALID_FLAGS; rc = md_setattr(ll_i2sbi(inode)->ll_md_exp, op_data, NULL, 0, &req); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (rc) GOTO(out_fsxattr, rc); ll_update_inode_flags(inode, op_data->op_attr_flags); @@ -5158,7 +5158,7 @@ int ll_fsync(struct file *file, loff_t start, loff_t end, int datasync) rc = err; if (!err) { lli->lli_synced_to_mds = true; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); } } @@ -5391,7 +5391,7 @@ int ll_get_fid_by_name(struct inode *parent, const char *name, if (inode != NULL) rc = ll_prep_inode(inode, &req->rq_pill, parent->i_sb, NULL); out_req: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } @@ -5536,7 +5536,7 @@ again: } if (request != NULL) { - ptlrpc_req_finished(request); + ptlrpc_req_put(request); request = NULL; } @@ -5741,7 +5741,7 @@ static int ll_inode_revalidate(struct dentry *dentry, enum ldlm_intent_flags op) ll_lookup_finish_locks(&oit, dentry); out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -6451,7 +6451,7 @@ static int ll_layout_fetch(struct inode *inode, struct ldlm_lock *lock) EXIT; out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } @@ -6601,7 +6601,7 @@ static int ll_layout_intent(struct inode *inode, struct layout_intent *intent) rc = md_intent_lock(sbi->ll_md_exp, op_data, &it, &req, &ll_md_blocking_ast, 0); if (it.it_request != NULL) - ptlrpc_req_finished(it.it_request); + ptlrpc_req_put(it.it_request); it.it_request = NULL; ll_finish_md_op_data(op_data); diff --git a/lustre/llite/llite_lib.c b/lustre/llite/llite_lib.c index 7643624..e79d4a5 100644 --- a/lustre/llite/llite_lib.c +++ b/lustre/llite/llite_lib.c @@ -752,7 +752,7 @@ retry_connect: sbi->ll_dt_exp, sbi->ll_md_exp, &lmd); if (err) { CERROR("failed to understand root inode md: rc = %d\n", err); - ptlrpc_req_finished(request); + ptlrpc_req_put(request); GOTO(out_lock_cn_cb, err); } @@ -767,7 +767,7 @@ retry_connect: root = NULL; CERROR("%s: bad ll_iget() for root: rc = %d\n", sbi->ll_fsname, err); - ptlrpc_req_finished(request); + ptlrpc_req_put(request); GOTO(out_root, err); } @@ -787,7 +787,7 @@ retry_connect: sbi->ll_fsname, PFID(&sbi->ll_root_fid), err); } - ptlrpc_req_finished(request); + ptlrpc_req_put(request); checksum = test_bit(LL_SBI_CHECKSUM, sbi->ll_flags); if (sbi->ll_checksum_set) { @@ -2005,7 +2005,7 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data) rc = md_setattr(sbi->ll_md_exp, op_data, NULL, 0, &request); if (rc) { - ptlrpc_req_finished(request); + ptlrpc_req_put(request); if (rc == -ENOENT) { clear_nlink(inode); /* Unlinked special device node? Or just a race? @@ -2028,7 +2028,7 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data) rc = md_get_lustre_md(sbi->ll_md_exp, &request->rq_pill, sbi->ll_dt_exp, sbi->ll_md_exp, &md); if (rc) { - ptlrpc_req_finished(request); + ptlrpc_req_put(request); RETURN(rc); } @@ -2045,7 +2045,7 @@ static int ll_md_setattr(struct dentry *dentry, struct md_op_data *op_data) op_data->op_attr.ia_valid = ia_valid; rc = ll_update_inode(inode, &md); - ptlrpc_req_finished(request); + ptlrpc_req_put(request); md_put_lustre_md(sbi->ll_md_exp, &md); RETURN(rc); @@ -3282,7 +3282,7 @@ static int fileattr_get(struct inode *inode, int *flags, if (*flags & LUSTRE_ENCRYPT_FL) *flags |= STATX_ATTR_ENCRYPTED; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); *xflags = ll_inode_flags_to_xflags(inode->i_flags); if (test_bit(LLIF_PROJECT_INHERIT, &ll_i2info(inode)->lli_flags)) @@ -3321,7 +3321,7 @@ static int fileattr_set(struct inode *inode, int flags) op_data->op_xvalid |= OP_XVALID_FLAGS; rc = md_setattr(sbi->ll_md_exp, op_data, NULL, 0, &req); ll_finish_md_op_data(op_data); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (rc) RETURN(rc); @@ -3626,7 +3626,7 @@ void ll_open_cleanup(struct super_block *sb, struct req_capsule *pill) op_data->op_open_handle = body->mbo_open_handle; op_data->op_mod_time = ktime_get_real_seconds(); md_close(exp, op_data, NULL, &close_req); - ptlrpc_req_finished(close_req); + ptlrpc_req_put(close_req); ll_finish_md_op_data(op_data); EXIT; @@ -3664,7 +3664,7 @@ static int ll_fileset_default_lmv_fixup(struct inode *inode, EXIT; out: if (req) - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return rc; } diff --git a/lustre/llite/llite_nfs.c b/lustre/llite/llite_nfs.c index 989143f..e5fdc13 100644 --- a/lustre/llite/llite_nfs.c +++ b/lustre/llite/llite_nfs.c @@ -106,7 +106,7 @@ struct inode *search_inode_for_lustre(struct super_block *sb, RETURN(ERR_PTR(rc)); } rc = ll_prep_inode(&inode, &req->rq_pill, sb, NULL); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (rc) RETURN(ERR_PTR(rc)); @@ -458,7 +458,7 @@ int ll_dir_get_parent_fid(struct inode *dir, struct lu_fid *parent_fid) *parent_fid = body->mbo_fid1; } - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(0); } diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c index cb58d58..8b77efd 100644 --- a/lustre/llite/namei.c +++ b/lustre/llite/namei.c @@ -1026,7 +1026,7 @@ inherit: fid_zero(&op_data->op_fid2); op_data->op_suppgids[1] = body->mbo_gid; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); req = NULL; ll_intent_release(it); rc = md_intent_lock(ll_i2mdexp(parent), op_data, it, &req, @@ -1089,7 +1089,7 @@ out: if (lum != NULL) OBD_FREE_PTR(lum); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); return retval; } @@ -1410,7 +1410,7 @@ static struct inode *ll_create_node(struct inode *dir, struct lookup_intent *it) ll_set_lock_data(sbi->ll_md_exp, inode, it, NULL); EXIT; out: - ptlrpc_req_finished(request); + ptlrpc_req_put(request); return inode; } @@ -1803,7 +1803,7 @@ again: int lumsize; int err2; - ptlrpc_req_finished(request); + ptlrpc_req_put(request); request = NULL; ll_finish_md_op_data(op_data); op_data = NULL; @@ -1853,7 +1853,7 @@ again: GOTO(err_exit, err); } - ptlrpc_req_finished(request); + ptlrpc_req_put(request); request = NULL; goto again; } @@ -1870,7 +1870,7 @@ again: EXIT; err_exit: if (request != NULL) - ptlrpc_req_finished(request); + ptlrpc_req_put(request); if (!IS_ERR_OR_NULL(op_data)) ll_finish_md_op_data(op_data); if (lum) @@ -2032,7 +2032,7 @@ static int ll_link(struct dentry *old_dentry, struct inode *dir, ktime_us_delta(ktime_get(), kstart)); EXIT; out: - ptlrpc_req_finished(request); + ptlrpc_req_put(request); clear: ll_clear_inode_lock_owner(src); ll_clear_inode_lock_owner(dir); @@ -2108,7 +2108,7 @@ static int ll_mkdir(struct mnt_idmap *map, struct inode *dir, out_fini: ll_finish_md_op_data(op_data); ll_intent_release(&mkdir_it); - ptlrpc_req_finished(request); + ptlrpc_req_put(request); if (lum) OBD_FREE_PTR(lum); @@ -2178,7 +2178,7 @@ static int ll_rmdir(struct inode *dir, struct dentry *dchild) } } - ptlrpc_req_finished(request); + ptlrpc_req_put(request); out: ll_clear_inode_lock_owner(dir); ll_clear_inode_lock_owner(dchild->d_inode); @@ -2210,7 +2210,7 @@ int ll_rmdir_entry(struct inode *dir, char *name, int namelen) if (!rc) ll_update_times(request, dir); - ptlrpc_req_finished(request); + ptlrpc_req_put(request); if (!rc) ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_RMDIR, ktime_us_delta(ktime_get(), kstart)); @@ -2278,7 +2278,7 @@ static int ll_unlink(struct inode *dir, struct dentry *dchild) ll_update_times(request, dir); out: - ptlrpc_req_finished(request); + ptlrpc_req_put(request); if (!rc) ll_stats_ops_tally(ll_i2sbi(dir), LPROC_LL_UNLINK, ktime_us_delta(ktime_get(), kstart)); @@ -2383,7 +2383,7 @@ static int ll_rename(struct mnt_idmap *map, ll_update_times(request, tgt); } - ptlrpc_req_finished(request); + ptlrpc_req_put(request); if (!err) { d_move(src_dchild, tgt_dchild); diff --git a/lustre/llite/statahead.c b/lustre/llite/statahead.c index 1379b6c..066b021 100644 --- a/lustre/llite/statahead.c +++ b/lustre/llite/statahead.c @@ -773,7 +773,7 @@ static void ll_statahead_interpret_fini(struct ll_inode_info *lli, ll_intent_release(&item->mop_it); sa_fini_data(item); if (req) - ptlrpc_req_finished(req); + ptlrpc_req_put(req); sa_make_ready(sai, entry, rc); spin_lock(&lli->lli_sa_lock); diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c index c5a3c86..d9d081d 100644 --- a/lustre/llite/symlink.c +++ b/lustre/llite/symlink.c @@ -158,7 +158,7 @@ static void ll_put_link(struct inode *unused, void *cookie) # endif #endif { - ptlrpc_req_finished(cookie); + ptlrpc_req_put(cookie); } #ifdef HAVE_SYMLINK_OPS_USE_NAMEIDATA @@ -187,7 +187,7 @@ static void *ll_follow_link(struct dentry *dentry, struct nameidata *nd) ll_inode_size_unlock(inode); } if (rc) { - ptlrpc_req_finished(request); + ptlrpc_req_put(request); request = NULL; symname = ERR_PTR(rc); } @@ -218,7 +218,7 @@ static const char *ll_get_link(struct dentry *dentry, rc = ll_readlink_internal(inode, &request, &symname, done); ll_inode_size_unlock(inode); if (rc < 0) { - ptlrpc_req_finished(request); + ptlrpc_req_put(request); return ERR_PTR(rc); } @@ -244,7 +244,7 @@ static const char *ll_follow_link(struct dentry *dentry, void **cookie) rc = ll_readlink_internal(inode, &request, &symname); ll_inode_size_unlock(inode); if (rc < 0) { - ptlrpc_req_finished(request); + ptlrpc_req_put(request); return ERR_PTR(rc); } diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c index 9839128..ca30be6 100644 --- a/lustre/llite/xattr.c +++ b/lustre/llite/xattr.c @@ -212,7 +212,7 @@ static int ll_xattr_set_common(const struct xattr_handler *handler, } ll_i2info(inode)->lli_synced_to_mds = false; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); ll_stats_ops_tally(ll_i2sbi(inode), valid == OBD_MD_FLXATTRRM ? LPROC_LL_REMOVEXATTR : LPROC_LL_SETXATTR, @@ -495,7 +495,7 @@ out_xattr: clear_bit(LL_SBI_USER_XATTR, sbi->ll_flags); } out: - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } @@ -644,9 +644,9 @@ out_env: GOTO(out_req, rc = lmm_size); out_req: if (req) - ptlrpc_req_finished(req); + ptlrpc_req_put(req); if (root_req) - ptlrpc_req_finished(root_req); + ptlrpc_req_put(root_req); RETURN(rc); } else { diff --git a/lustre/llite/xattr_cache.c b/lustre/llite/xattr_cache.c index 5b1d917..c5ef3ec 100644 --- a/lustre/llite/xattr_cache.c +++ b/lustre/llite/xattr_cache.c @@ -535,7 +535,7 @@ static int ll_xattr_cache_refill(struct inode *inode) ll_set_lock_data(sbi->ll_md_exp, inode, &oit, NULL); ll_intent_drop_lock(&oit); - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(0); err_cancel: @@ -548,7 +548,7 @@ err_req: if (rc == -ERANGE) rc = -EAGAIN; - ptlrpc_req_finished(req); + ptlrpc_req_put(req); RETURN(rc); } -- 1.8.3.1