LU-3963 libcfs: convert llite/lmv/lod/lov cfs_atomic primitive

[fs/lustre-release.git] / lustre / lov / lov_cl_internal.h

diff --git a/lustre/lov/lov_cl_internal.h b/lustre/lov/lov_cl_internal.h
index a34bdcf..55603ee 100644 (file)
--- a/lustre/lov/lov_cl_internal.h
+++ b/lustre/lov/lov_cl_internal.h
@@ -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
         */
@@ -450,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;
 };
 
 /**
@@ -618,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);
@@ -642,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)
@@ -802,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)
 {