X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nrs_tbf.h;h=b36b5497efdf8e02b616ca168516121733ece515;hb=e8b421531c166b91ab5c1f417570c544bcdd050c;hp=02ebfd4ac91e7dd5770fb6d579a5e6e0db658d20;hpb=8701e7e4b5ec1b34700c95b9b6588f4745730b72;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nrs_tbf.h b/lustre/include/lustre_nrs_tbf.h
index 02ebfd4..b36b549 100644
--- a/lustre/include/lustre_nrs_tbf.h
+++ b/lustre/include/lustre_nrs_tbf.h
@@ -6,22 +6,22 @@
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 only,
  * as published by the Free Software Foundation.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License version 2 for more details.  A copy is
- * included in the COPYING file that accompanied this code.
-
+ * GNU General Public License version 2 for more details.
+ *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program; If not, see
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
 /*
  * Copyright (C) 2013 DataDirect Networks, Inc.
  *
+ * Copyright (c) 2014, Intel Corporation.
  */
 /*
  *
@@ -31,7 +31,6 @@
 
 #ifndef _LUSTRE_NRS_TBF_H
 #define _LUSTRE_NRS_TBF_H
-#include <lustre_net.h>
 
 /* \name tbf
  *
@@ -56,7 +55,7 @@ struct nrs_tbf_client {
 	/** NID of the client. */
 	lnet_nid_t			 tc_nid;
 	/** Jobid of the client. */
-	char				 tc_jobid[JOBSTATS_JOBID_SIZE];
+	char				 tc_jobid[LUSTRE_JOBID_SIZE];
 	/** Reference number of the client. */
 	atomic_t			 tc_ref;
 	/** Likage to rule. */
@@ -185,9 +184,7 @@ struct nrs_tbf_head {
 	/**
 	 * Timer for next token.
 	 */
-#if defined(__KERNEL__) && defined(__linux__)
 	struct hrtimer			 th_timer;
-#endif
 	/**
 	 * Deadline of the timer.
 	 */
@@ -203,7 +200,7 @@ struct nrs_tbf_head {
 	/**
 	 * Hash of clients.
 	 */
-	cfs_hash_t			*th_cli_hash;
+	struct cfs_hash			*th_cli_hash;
 	/**
 	 * Type of TBF policy.
 	 */