X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Finclude%2Flustre_nrs_orr.h;h=df3d16ab8b1c94b1070e1dffd94db52ad65d559c;hb=7cf10b90d62256aa4d177486ff13bd61dfb9a5ff;hp=eb69fa8abb1fc4e17e9b9c3b5d2fca0b3726e269;hpb=d8278c699434fd7975609e121a1a75820595a601;p=fs%2Flustre-release.git

diff --git a/lustre/include/lustre_nrs_orr.h b/lustre/include/lustre_nrs_orr.h
index eb69fa8..df3d16a 100644
--- a/lustre/include/lustre_nrs_orr.h
+++ b/lustre/include/lustre_nrs_orr.h
@@ -64,13 +64,13 @@ struct nrs_orr_req_range {
  * RPC types supported by the ORR/TRR policies
  */
 enum nrs_orr_supp {
-	NOS_OST_READ  = (1 << 0),
-	NOS_OST_WRITE = (1 << 1),
-	NOS_OST_RW    = (NOS_OST_READ | NOS_OST_WRITE),
+	NOS_OST_READ	= BIT(0),
+	NOS_OST_WRITE	= BIT(1),
+	NOS_OST_RW	= (NOS_OST_READ | NOS_OST_WRITE),
 	/**
 	 * Default value for policies.
 	 */
-	NOS_DFLT      = NOS_OST_READ
+	NOS_DFLT	= NOS_OST_READ
 };
 
 /**
@@ -106,7 +106,7 @@ struct nrs_orr_key {
  */
 struct nrs_orr_data {
 	struct ptlrpc_nrs_resource	od_res;
-	cfs_binheap_t		       *od_binheap;
+	struct binheap	       *od_binheap;
 	struct cfs_hash		       *od_obj_hash;
 	struct kmem_cache	       *od_cache;
 	/**