LU-14366 mdt: lfs mkdir should return -EEXIST if exists

[fs/lustre-release.git] / lustre / include / lustre_nrs_orr.h

diff --git a/lustre/include/lustre_nrs_orr.h b/lustre/include/lustre_nrs_orr.h
index eb69fa8..df3d16a 100644 (file)
--- 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;
        /**