Whamcloud - gitweb
LU-3963 libcfs: convert llite/lmv/lod/lov cfs_atomic primitive
[fs/lustre-release.git] / lustre / lov / lov_cl_internal.h
index 4b1f083..55603ee 100644 (file)
@@ -203,15 +203,15 @@ static inline char *llt2str(enum lov_layout_type llt)
  * function corresponding to the current layout type.
  */
 struct lov_object {
-        struct cl_object       lo_cl;
-        /**
-         * Serializes object operations with transitions between layout types.
-         *
-         * This semaphore is taken in shared mode by all object methods, and
-         * is taken in exclusive mode when object type is changed.
-         *
-         * \see lov_object::lo_type
-         */
+       struct cl_object       lo_cl;
+       /**
+        * Serializes object operations with transitions between layout types.
+        *
+        * This semaphore is taken in shared mode by all object methods, and
+        * is taken in exclusive mode when object type is changed.
+        *
+        * \see lov_object::lo_type
+        */
        struct rw_semaphore     lo_type_guard;
        /**
         * Type of an object. Protected by lov_object::lo_type_guard.
@@ -226,7 +226,7 @@ struct lov_object {
         * How many IOs are on going on this object. Layout can be changed
         * only if there is no active IO.
         */
-       cfs_atomic_t           lo_active_ios;
+       atomic_t               lo_active_ios;
        /**
         * Waitq - wait for no one else is using lo_lsm
         */
@@ -236,9 +236,9 @@ struct lov_object {
         */
        struct lov_stripe_md  *lo_lsm;
 
-        union lov_layout_state {
-                struct lov_layout_raid0 {
-                        unsigned               lo_nr;
+       union lov_layout_state {
+               struct lov_layout_raid0 {
+                       unsigned               lo_nr;
                        /**
                         * When this is true, lov_object::lo_attr contains
                         * valid up to date attributes for a top-level
@@ -246,42 +246,42 @@ struct lov_object {
                         * any sub-object change.
                         */
                        int                    lo_attr_valid;
-                        /**
-                         * Array of sub-objects. Allocated when top-object is
-                         * created (lov_init_raid0()).
-                         *
-                         * Top-object is a strict master of its sub-objects:
-                         * it is created before them, and outlives its
-                         * children (this later is necessary so that basic
-                         * functions like cl_object_top() always
-                         * work). Top-object keeps a reference on every
-                         * sub-object.
-                         *
-                         * When top-object is destroyed (lov_delete_raid0())
-                         * it releases its reference to a sub-object and waits
-                         * until the latter is finally destroyed.
-                         */
-                        struct lovsub_object **lo_sub;
-                        /**
-                         * protect lo_sub
-                         */
+                       /**
+                        * Array of sub-objects. Allocated when top-object is
+                        * created (lov_init_raid0()).
+                        *
+                        * Top-object is a strict master of its sub-objects:
+                        * it is created before them, and outlives its
+                        * children (this later is necessary so that basic
+                        * functions like cl_object_top() always
+                        * work). Top-object keeps a reference on every
+                        * sub-object.
+                        *
+                        * When top-object is destroyed (lov_delete_raid0())
+                        * it releases its reference to a sub-object and waits
+                        * until the latter is finally destroyed.
+                        */
+                       struct lovsub_object **lo_sub;
+                       /**
+                        * protect lo_sub
+                        */
                        spinlock_t              lo_sub_lock;
-                        /**
-                         * Cached object attribute, built from sub-object
-                         * attributes.
-                         */
-                        struct cl_attr         lo_attr;
-                } raid0;
-                struct lov_layout_state_empty {
-                } empty;
+                       /**
+                        * Cached object attribute, built from sub-object
+                        * attributes.
+                        */
+                       struct cl_attr         lo_attr;
+               } raid0;
+               struct lov_layout_state_empty {
+               } empty;
                struct lov_layout_state_released {
                } released;
-        } u;
-        /**
-         * Thread that acquired lov_object::lo_type_guard in an exclusive
-         * mode.
-         */
-        cfs_task_t            *lo_owner;
+       } u;
+       /**
+        * Thread that acquired lov_object::lo_type_guard in an exclusive
+        * mode.
+        */
+       struct task_struct            *lo_owner;
 };
 
 /**
@@ -320,7 +320,8 @@ struct lov_lock {
          * Set when sub-lock was canceled, while top-lock was being
          * used, or unused.
          */
-       unsigned int           lls_cancel_race:1;
+       unsigned int           lls_cancel_race:1,
+                               lls_ever_canceled:1;
         /**
          * An array of sub-locks
          *
@@ -449,8 +450,10 @@ struct lov_thread_info {
        struct cl_lock_descr    lti_ldescr;
        struct ost_lvb          lti_lvb;
        struct cl_2queue        lti_cl2q;
+       struct cl_page_list     lti_plist;
        struct cl_lock_closure  lti_closure;
        wait_queue_t            lti_waiter;
+       struct cl_attr          lti_attr;
 };
 
 /**
@@ -617,16 +620,13 @@ int   lov_sublock_modify  (const struct lu_env *env, struct lov_lock *lov,
 
 
 int   lov_page_init       (const struct lu_env *env, struct cl_object *ob,
-                          struct cl_page *page, struct page *vmpage);
+                          struct cl_page *page, pgoff_t index);
 int   lovsub_page_init    (const struct lu_env *env, struct cl_object *ob,
-                          struct cl_page *page, struct page *vmpage);
-
-int   lov_page_init_empty (const struct lu_env *env,
-                           struct cl_object *obj,
-                          struct cl_page *page, struct page *vmpage);
-int   lov_page_init_raid0 (const struct lu_env *env,
-                           struct cl_object *obj,
-                          struct cl_page *page, struct page *vmpage);
+                          struct cl_page *page, pgoff_t index);
+int   lov_page_init_empty (const struct lu_env *env, struct cl_object *obj,
+                          struct cl_page *page, pgoff_t index);
+int   lov_page_init_raid0 (const struct lu_env *env, struct cl_object *obj,
+                          struct cl_page *page, pgoff_t index);
 struct lu_object *lov_object_alloc   (const struct lu_env *env,
                                       const struct lu_object_header *hdr,
                                       struct lu_device *dev);
@@ -641,8 +641,8 @@ struct lov_io_sub    *lov_page_subio    (const struct lu_env *env,
                                          struct lov_io *lio,
                                          const struct cl_page_slice *slice);
 
-void lov_lsm_decref(struct lov_object *lov, struct lov_stripe_md *lsm);
 struct lov_stripe_md *lov_lsm_addref(struct lov_object *lov);
+int lov_page_stripe(const struct cl_page *page);
 
 #define lov_foreach_target(lov, var)                    \
         for (var = 0; var < lov_targets_nr(lov); ++var)
@@ -801,11 +801,6 @@ static inline struct lovsub_req *cl2lovsub_req(const struct cl_req_slice *slice)
         return container_of0(slice, struct lovsub_req, lsrq_cl);
 }
 
-static inline struct cl_page *lov_sub_page(const struct cl_page_slice *slice)
-{
-        return slice->cpl_page->cp_child;
-}
-
 static inline struct lov_io *cl2lov_io(const struct lu_env *env,
                                 const struct cl_io_slice *ios)
 {