Branch b1_8

b=17800
i=adilger
i=huanghua

Add missing ll_rpc_opcode_table entries for "MDS_WRITEPAGE" and "MDS_IS_SUBDIR".

diff --git a/lustre/include/lprocfs_status.h b/lustre/include/lprocfs_status.h
index 69cee95..d384f1c 100644 (file)
--- a/lustre/include/lprocfs_status.h
+++ b/lustre/include/lprocfs_status.h
@@ -224,7 +224,7 @@ static inline int opcode_offset(__u32 opc) {
                         (OST_LAST_OPC - OST_FIRST_OPC));
        } else if (opc < QUOTA_LAST_OPC) {
                 /* LQUOTA Opcode */
-                return (opc -  QUOTA_FIRST_OPC +
+                return (opc - QUOTA_FIRST_OPC +
                         (LLOG_LAST_OPC - LLOG_FIRST_OPC) +
                         (OBD_LAST_OPC - OBD_FIRST_OPC) +
                         (MGS_LAST_OPC - MGS_FIRST_OPC) +

diff --git a/lustre/ptlrpc/lproc_ptlrpc.c b/lustre/ptlrpc/lproc_ptlrpc.c
index 12c996f..a62c6b2 100644 (file)
--- a/lustre/ptlrpc/lproc_ptlrpc.c
+++ b/lustre/ptlrpc/lproc_ptlrpc.c
@@ -91,6 +91,8 @@ struct ll_rpc_opcode {
         { MDS_QUOTACTL,     "mds_quotactl" },
         { MDS_GETXATTR,     "mds_getxattr" },
         { MDS_SETXATTR,     "mds_setxattr" },
+        { MDS_WRITEPAGE,    "mds_writepage" },
+        { MDS_IS_SUBDIR,    "mds_is_subdir" },
         { LDLM_ENQUEUE,     "ldlm_enqueue" },
         { LDLM_CONVERT,     "ldlm_convert" },
         { LDLM_CANCEL,      "ldlm_cancel" },