From 7c26f172a9a54348e73c98a40d6e2d61fd3f2cea Mon Sep 17 00:00:00 2001 From: tianzy Date: Fri, 1 Aug 2008 04:42:31 +0000 Subject: [PATCH] Branch b1_8 add lquota operations in operation table b=16304 i=zhenyu.xu i=tianzy --- lustre/ptlrpc/lproc_ptlrpc.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c index bd28a56..9d0bb8a 100644 --- a/lustre/ptlrpc/lproc_ptlrpc.c +++ b/lustre/ptlrpc/lproc_ptlrpc.c @@ -116,6 +116,8 @@ struct ll_rpc_opcode { { LLOG_ORIGIN_HANDLE_PREV_BLOCK, "llog_origin_handle_prev_block" }, { LLOG_ORIGIN_HANDLE_DESTROY, "llog_origin_handle_destroy" }, { FLD_QUERY, "fld_query" }, + { QUOTA_DQACQ, "quota_acquire" }, + { QUOTA_DQREL, "quota_release" }, { SEQ_QUERY, "seq_query" }, }; @@ -128,26 +130,30 @@ struct ll_eopcode { { LDLM_EXTENT_ENQUEUE, "ldlm_extent_enqueue" }, { LDLM_FLOCK_ENQUEUE, "ldlm_flock_enqueue" }, { LDLM_IBITS_ENQUEUE, "ldlm_ibits_enqueue" }, + { MDS_REINT_SETATTR, "mds_reint_setattr" }, { MDS_REINT_CREATE, "mds_reint_create" }, { MDS_REINT_LINK, "mds_reint_link" }, - { MDS_REINT_OPEN, "mds_reint_open" }, - { MDS_REINT_SETATTR, "mds_reint_setattr" }, + { MDS_REINT_UNLINK, "mds_reint_unlink" }, { MDS_REINT_RENAME, "mds_reint_rename" }, - { MDS_REINT_UNLINK, "mds_reint_unlink" } + { MDS_REINT_OPEN, "mds_reint_open" }, }; const char *ll_opcode2str(__u32 opcode) { /* When one of the assertions below fail, chances are that: - * 1) A new opcode was added in lustre_idl.h, but was - * is missing from the table above. + * 1) A new opcode was added in include/lustre/lustre_idl.h, + * but is missing from the table above. * or 2) The opcode space was renumbered or rearranged, * and the opcode_offset() function in * ptlrpc_internal.h needs to be modified. */ __u32 offset = opcode_offset(opcode); - LASSERT(offset < LUSTRE_MAX_OPCODES); - LASSERT(ll_rpc_opcode_table[offset].opcode == opcode); + LASSERTF(offset < LUSTRE_MAX_OPCODES, + "offset %u >= LUSTRE_MAX_OPCODES %u\n", + offset, LUSTRE_MAX_OPCODES); + LASSERTF(ll_rpc_opcode_table[offset].opcode == opcode, + "ll_rpc_opcode_table[%u].opcode %u != opcode %u\n", + offset, ll_rpc_opcode_table[offset].opcode, opcode); return ll_rpc_opcode_table[offset].opname; } @@ -156,6 +162,7 @@ const char* ll_eopcode2str(__u32 opcode) LASSERT(ll_eopcode_table[opcode].opcode == opcode); return ll_eopcode_table[opcode].opname; } + #ifdef LPROCFS void ptlrpc_lprocfs_register(struct proc_dir_entry *root, char *dir, char *name, struct proc_dir_entry **procroot_ret, -- 1.8.3.1