X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fptlrpc%2Fnrs_tbf.c;h=af7d696d0f28fc5ea480dcbe577d4cabfc446c59;hb=0ad4f8a4227ed7dd93fec99d33c6bb25056473fc;hp=63c7b3852429e0d8539f9d3307ba7d80537dd021;hpb=e8f81877a33017a6bfd7d6e75c5a8b1fc336f347;p=fs%2Flustre-release.git

diff --git a/lustre/ptlrpc/nrs_tbf.c b/lustre/ptlrpc/nrs_tbf.c
index 63c7b38..af7d696 100644
--- a/lustre/ptlrpc/nrs_tbf.c
+++ b/lustre/ptlrpc/nrs_tbf.c
@@ -38,9 +38,6 @@
  */
 
 #define DEBUG_SUBSYSTEM S_RPC
-#ifndef __KERNEL__
-#include <liblustre.h>
-#endif
 #include <obd_support.h>
 #include <obd_class.h>
 #include <libcfs/libcfs.h>
@@ -629,7 +626,7 @@ nrs_tbf_jobid_cli_init(struct nrs_tbf_client *cli,
 
 	if (jobid == NULL)
 		jobid = NRS_TBF_JOBID_NULL;
-	LASSERT(strlen(jobid) < JOBSTATS_JOBID_SIZE);
+	LASSERT(strlen(jobid) < LUSTRE_JOBID_SIZE);
 	INIT_LIST_HEAD(&cli->tc_lru);
 	memcpy(cli->tc_jobid, jobid, strlen(jobid));
 }
@@ -1828,7 +1825,7 @@ LPROC_SEQ_FOPS(ptlrpc_lprocfs_nrs_tbf_rule);
  */
 int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc)
 {
-	struct lprocfs_seq_vars nrs_tbf_lprocfs_vars[] = {
+	struct lprocfs_vars nrs_tbf_lprocfs_vars[] = {
 		{ .name		= "nrs_tbf_rule",
 		  .fops		= &ptlrpc_lprocfs_nrs_tbf_rule_fops,
 		  .data = svc },
@@ -1838,8 +1835,7 @@ int nrs_tbf_lprocfs_init(struct ptlrpc_service *svc)
 	if (svc->srv_procroot == NULL)
 		return 0;
 
-	return lprocfs_seq_add_vars(svc->srv_procroot, nrs_tbf_lprocfs_vars,
-				    NULL);
+	return lprocfs_add_vars(svc->srv_procroot, nrs_tbf_lprocfs_vars, NULL);
 }
 
 /**