X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flmv%2Flmv_internal.h;h=5c98cb7837d5b9029b2eb8981e747aebd56bbcbd;hb=3698e90b9b8bdea6307f3b1fc568d7ed7c3fe1cf;hp=818d53ddb403beed5613a951853fa48d9f9a8911;hpb=54e6e2442374d11ba55518b552f7230a989c9b1c;p=fs%2Flustre-release.git

diff --git a/lustre/lmv/lmv_internal.h b/lustre/lmv/lmv_internal.h
index 818d53d..5c98cb7 100644
--- a/lustre/lmv/lmv_internal.h
+++ b/lustre/lmv/lmv_internal.h
@@ -42,22 +42,22 @@
 
 #define LMV_MAX_TGT_COUNT 128
 
-#define lmv_init_lock(lmv)   down(&lmv->init_sem);
-#define lmv_init_unlock(lmv) up(&lmv->init_sem);
+#define lmv_init_lock(lmv)   cfs_down(&lmv->init_sem);
+#define lmv_init_unlock(lmv) cfs_up(&lmv->init_sem);
 
 #define LL_IT2STR(it)				        \
 	((it) ? ldlm_it2str((it)->it_op) : "0")
 
 struct lmv_stripe {
-        /** 
-         * Dir stripe fid. 
+        /**
+         * Dir stripe fid.
          */
         struct lu_fid           ls_fid;
-        /** 
-         * Cached home mds number for @li_fid. 
+        /**
+         * Cached home mds number for \a li_fid.
          */
         mdsno_t                 ls_mds;
-        /** 
+        /**
          * Stripe object size.
          */
         unsigned long           ls_size;
@@ -73,20 +73,20 @@ struct lmv_object {
         /**
          * Link to global objects list.
          */
-        struct list_head        lo_list;
+        cfs_list_t              lo_list;
         /**
          * Sema for protecting fields.
          */
-        struct semaphore        lo_guard;
-        /** 
+        cfs_semaphore_t         lo_guard;
+        /**
          * Object state like O_FREEING.
          */
         int                     lo_state;
-        /** 
-         * Object ref counter. 
+        /**
+         * Object ref counter.
          */
-        atomic_t                lo_count;
-        /** 
+        cfs_atomic_t            lo_count;
+        /**
          * Object master fid.
          */
         struct lu_fid           lo_fid;
@@ -94,15 +94,15 @@ struct lmv_object {
          * Object hash type to find stripe by name.
          */
         __u32		        lo_hashtype;
-        /** 
-         * Number of stripes. 
+        /**
+         * Number of stripes.
          */
         int                     lo_objcount;
-        /** 
-         * Array of sub-objs. 
+        /**
+         * Array of sub-objs.
          */
         struct lmv_stripe      *lo_stripes;
-        /** 
+        /**
          * Pointer to LMV obd.
          */
         struct obd_device      *lo_obd;
@@ -115,14 +115,14 @@ static inline void
 lmv_object_lock(struct lmv_object *obj)
 {
         LASSERT(obj);
-        down(&obj->lo_guard);
+        cfs_down(&obj->lo_guard);
 }
 
 static inline void
 lmv_object_unlock(struct lmv_object *obj)
 {
         LASSERT(obj);
-        up(&obj->lo_guard);
+        cfs_up(&obj->lo_guard);
 }
 
 void lmv_object_add(struct lmv_object *obj);
@@ -233,7 +233,7 @@ lmv_find_target(struct lmv_obd *lmv, const struct lu_fid *fid)
 {
         mdsno_t mds;
         int rc;
-        
+
         rc = lmv_fld_lookup(lmv, fid, &mds);
         if (rc)
                 return ERR_PTR(rc);