LU-6142 lov: convert container_of0() calls.

[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 a41e978..083b5ba 100644 (file)
--- a/lustre/lov/lov_cl_internal.h
+++ b/lustre/lov/lov_cl_internal.h
@@ -83,7 +83,7 @@ struct lovsub_device;
 struct lovsub_object;
 
 enum lov_device_flags {
-        LOV_DEV_INITIALIZED = 1 << 0
+       LOV_DEV_INITIALIZED = BIT(0),
 };
 
 /*
@@ -340,7 +340,8 @@ static inline struct lov_layout_raid0 *lov_r0(struct lov_object *lov, int i)
 {
        LASSERT(lov->lo_type == LLT_COMP);
        LASSERTF(i < lov->u.composite.lo_entry_count,
-                "entry %d entry_count %d", i, lov->u.composite.lo_entry_count);
+                "entry %d entry_count %d\n", i,
+                lov->u.composite.lo_entry_count);
 
        return &lov->u.composite.lo_entries[i].lle_raid0;
 }
@@ -370,7 +371,8 @@ static inline struct lov_layout_entry *lov_entry(struct lov_object *lov, int i)
 {
        LASSERT(lov->lo_type == LLT_COMP);
        LASSERTF(i < lov->u.composite.lo_entry_count,
-                "entry %d entry_count %d", i, lov->u.composite.lo_entry_count);
+                "entry %d entry_count %d\n", i,
+                lov->u.composite.lo_entry_count);
 
        return &lov->u.composite.lo_entries[i];
 }
@@ -437,8 +439,6 @@ struct lov_lock {
 
 struct lov_page {
        struct cl_page_slice    lps_cl;
-       /** layout_entry + stripe index, composed using lov_comp_index() */
-       unsigned int            lps_index;
        /* the layout gen when this page was created */
        __u32                   lps_layout_gen;
 };
@@ -473,7 +473,6 @@ struct lov_thread_info {
        struct ost_lvb          lti_lvb;
        struct cl_2queue        lti_cl2q;
        struct cl_page_list     lti_plist;
-       wait_queue_entry_t      lti_waiter;
 };
 
 /**
@@ -698,8 +697,8 @@ static inline struct lu_device *lov2lu_dev(struct lov_device *lov)
 
 static inline struct lov_device *lu2lov_dev(const struct lu_device *d)
 {
-        LINVRNT(d->ld_type == &lov_device_type);
-        return container_of0(d, struct lov_device, ld_cl.cd_lu_dev);
+       LINVRNT(d->ld_type == &lov_device_type);
+       return container_of(d, struct lov_device, ld_cl.cd_lu_dev);
 }
 
 static inline struct cl_device *lovsub2cl_dev(struct lovsub_device *lovsub)
@@ -714,14 +713,14 @@ static inline struct lu_device *lovsub2lu_dev(struct lovsub_device *lovsub)
 
 static inline struct lovsub_device *lu2lovsub_dev(const struct lu_device *d)
 {
-        LINVRNT(d->ld_type == &lovsub_device_type);
-        return container_of0(d, struct lovsub_device, acid_cl.cd_lu_dev);
+       LINVRNT(d->ld_type == &lovsub_device_type);
+       return container_of(d, struct lovsub_device, acid_cl.cd_lu_dev);
 }
 
 static inline struct lovsub_device *cl2lovsub_dev(const struct cl_device *d)
 {
-        LINVRNT(d->cd_lu_dev.ld_type == &lovsub_device_type);
-        return container_of0(d, struct lovsub_device, acid_cl);
+       LINVRNT(d->cd_lu_dev.ld_type == &lovsub_device_type);
+       return container_of(d, struct lovsub_device, acid_cl);
 }
 
 static inline struct lu_object *lov2lu(struct lov_object *lov)
@@ -736,48 +735,48 @@ static inline struct cl_object *lov2cl(struct lov_object *lov)
 
 static inline struct lov_object *lu2lov(const struct lu_object *obj)
 {
-        LINVRNT(lov_is_object(obj));
-        return container_of0(obj, struct lov_object, lo_cl.co_lu);
+       LINVRNT(lov_is_object(obj));
+       return container_of(obj, struct lov_object, lo_cl.co_lu);
 }
 
 static inline struct lov_object *cl2lov(const struct cl_object *obj)
 {
-        LINVRNT(lov_is_object(&obj->co_lu));
-        return container_of0(obj, struct lov_object, lo_cl);
+       LINVRNT(lov_is_object(&obj->co_lu));
+       return container_of(obj, struct lov_object, lo_cl);
 }
 
 static inline struct lu_object *lovsub2lu(struct lovsub_object *los)
 {
-        return &los->lso_cl.co_lu;
+       return &los->lso_cl.co_lu;
 }
 
 static inline struct cl_object *lovsub2cl(struct lovsub_object *los)
 {
-        return &los->lso_cl;
+       return &los->lso_cl;
 }
 
 static inline struct lovsub_object *cl2lovsub(const struct cl_object *obj)
 {
-        LINVRNT(lovsub_is_object(&obj->co_lu));
-        return container_of0(obj, struct lovsub_object, lso_cl);
+       LINVRNT(lovsub_is_object(&obj->co_lu));
+       return container_of(obj, struct lovsub_object, lso_cl);
 }
 
 static inline struct lovsub_object *lu2lovsub(const struct lu_object *obj)
 {
-        LINVRNT(lovsub_is_object(obj));
-        return container_of0(obj, struct lovsub_object, lso_cl.co_lu);
+       LINVRNT(lovsub_is_object(obj));
+       return container_of(obj, struct lovsub_object, lso_cl.co_lu);
 }
 
 static inline struct lov_lock *cl2lov_lock(const struct cl_lock_slice *slice)
 {
-        LINVRNT(lov_is_object(&slice->cls_obj->co_lu));
-        return container_of(slice, struct lov_lock, lls_cl);
+       LINVRNT(lov_is_object(&slice->cls_obj->co_lu));
+       return container_of(slice, struct lov_lock, lls_cl);
 }
 
 static inline struct lov_page *cl2lov_page(const struct cl_page_slice *slice)
 {
-        LINVRNT(lov_is_object(&slice->cpl_obj->co_lu));
-        return container_of0(slice, struct lov_page, lps_cl);
+       LINVRNT(lov_is_object(&slice->cpl_obj->co_lu));
+       return container_of(slice, struct lov_page, lps_cl);
 }
 
 static inline struct lov_io *cl2lov_io(const struct lu_env *env,