Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
LU-13004 ptlrpc: Allow BULK_BUF_KIOV to accept a kvec
[fs/lustre-release.git]
/
lustre
/
ptlrpc
/
lproc_ptlrpc.c
diff --git
a/lustre/ptlrpc/lproc_ptlrpc.c
b/lustre/ptlrpc/lproc_ptlrpc.c
index
5929fe3
..
266e1c1
100644
(file)
--- a/
lustre/ptlrpc/lproc_ptlrpc.c
+++ b/
lustre/ptlrpc/lproc_ptlrpc.c
@@
-95,6
+95,7
@@
static struct ll_rpc_opcode {
{ MDS_HSM_CT_REGISTER, "mds_hsm_ct_register" },
{ MDS_HSM_CT_UNREGISTER, "mds_hsm_ct_unregister" },
{ MDS_SWAP_LAYOUTS, "mds_swap_layouts" },
+ { MDS_RMFID, "mds_rmfid" },
{ LDLM_ENQUEUE, "ldlm_enqueue" },
{ LDLM_CONVERT, "ldlm_convert" },
{ LDLM_CANCEL, "ldlm_cancel" },
@@
-257,15
+258,15
@@
ptlrpc_ldebugfs_register(struct dentry *root, char *dir, char *name,
}
rc = ldebugfs_register_stats(svc_debugfs_entry, name, svc_stats);
-
if (rc < 0) {
-
if (dir)
-
ldebugfs_remove(&
svc_debugfs_entry);
-
lprocfs_free_stats(&svc_stats);
-
} else {
-
if (dir)
+ if (rc < 0) {
+ if (dir)
+
debugfs_remove_recursive(
svc_debugfs_entry);
+ lprocfs_free_stats(&svc_stats);
+ } else {
+ if (dir)
*debugfs_root_ret = svc_debugfs_entry;
-
*stats_ret = svc_stats;
-
}
+ *stats_ret = svc_stats;
+ }
}
static int
@@
-516,7
+517,7
@@
void nrs_policy_get_info_locked(struct ptlrpc_nrs_policy *policy,
LASSERT(info != NULL);
assert_spin_locked(&policy->pol_nrs->nrs_lock);
-
CLASSERT(sizeof(info->pi_arg) =
= sizeof(policy->pol_arg));
+
BUILD_BUG_ON(sizeof(info->pi_arg) !
= sizeof(policy->pol_arg));
memcpy(info->pi_name, policy->pol_desc->pd_name, NRS_POL_NAME_MAX);
memcpy(info->pi_arg, policy->pol_arg, sizeof(policy->pol_arg));
@@
-1226,7
+1227,7
@@
void ptlrpc_ldebugfs_register_service(struct dentry *entry,
ptlrpc_ldebugfs_register(entry, svc->srv_name, "stats",
&svc->srv_debugfs_entry, &svc->srv_stats);
- if (
IS_ERR_OR_NULL(svc->srv_debugfs_entry)
)
+ if (
!svc->srv_debugfs_entry
)
return;
ldebugfs_add_vars(svc->srv_debugfs_entry, lproc_vars, NULL);
@@
-1289,11
+1290,10
@@
EXPORT_SYMBOL(ptlrpc_lprocfs_brw);
void ptlrpc_lprocfs_unregister_service(struct ptlrpc_service *svc)
{
- if (!IS_ERR_OR_NULL(svc->srv_debugfs_entry))
- ldebugfs_remove(&svc->srv_debugfs_entry);
+ debugfs_remove_recursive(svc->srv_debugfs_entry);
-
if (svc->srv_stats)
-
lprocfs_free_stats(&svc->srv_stats);
+ if (svc->srv_stats)
+ lprocfs_free_stats(&svc->srv_stats);
}
void ptlrpc_lprocfs_unregister_obd(struct obd_device *obd)
@@
-1303,11
+1303,10
@@
void ptlrpc_lprocfs_unregister_obd(struct obd_device *obd)
*/
lprocfs_obd_cleanup(obd);
- if (!IS_ERR_OR_NULL(obd->obd_svc_debugfs_entry))
- ldebugfs_remove(&obd->obd_svc_debugfs_entry);
+ debugfs_remove_recursive(obd->obd_svc_debugfs_entry);
-
if (obd->obd_svc_stats)
-
lprocfs_free_stats(&obd->obd_svc_stats);
+ if (obd->obd_svc_stats)
+ lprocfs_free_stats(&obd->obd_svc_stats);
}
EXPORT_SYMBOL(ptlrpc_lprocfs_unregister_obd);
@@
-1377,6
+1376,8
@@
lprocfs_import_seq_write(struct file *file, const char __user *buffer,
if (strncmp(prefix, kbuf, prefix_len) != 0)
GOTO(out, count = -EINVAL);
+ LPROCFS_CLIMP_CHECK(obd);
+
uuid = kbuf + prefix_len;
ptr = strstr(uuid, "::");
if (ptr) {
@@
-1402,6
+1403,7
@@
lprocfs_import_seq_write(struct file *file, const char __user *buffer,
}
}
+ LPROCFS_CLIMP_EXIT(obd);
if (do_reconn)
ptlrpc_recover_import(imp, uuid, 1);