LU-6142 lustre: use BIT() macro where appropriate in include

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

diff --git a/lustre/include/lustre_osc.h b/lustre/include/lustre_osc.h
index 9a0fd6a..656b60a 100644 (file)
--- a/lustre/include/lustre_osc.h
+++ b/lustre/include/lustre_osc.h
@@ -221,11 +221,11 @@ enum osc_dap_flags {
         * Just check if the desired lock exists, it won't hold reference
         * count on lock.
         */
-       OSC_DAP_FL_TEST_LOCK = 1 << 0,
+       OSC_DAP_FL_TEST_LOCK = BIT(0),
        /**
         * Return the lock even if it is being canceled.
         */
-       OSC_DAP_FL_CANCELING = 1 << 1
+       OSC_DAP_FL_CANCELING = BIT(1),
 };
 
 /*
@@ -533,7 +533,7 @@ struct osc_brw_async_args {
        int                      aa_requested_nob;
        int                      aa_nio_count;
        u32                      aa_page_count;
-       int                      aa_resends;
+       s32                      aa_resends;
        struct brw_page         **aa_ppga;
        struct client_obd       *aa_cli;
        struct list_head         aa_oaps;
@@ -822,7 +822,7 @@ static inline struct osc_page *oap2osc(struct osc_async_page *oap)
 
 static inline pgoff_t osc_index(struct osc_page *opg)
 {
-       return opg->ops_cl.cpl_index;
+       return opg->ops_cl.cpl_page->cp_osc_index;
 }
 
 static inline struct cl_page *oap2cl_page(struct osc_async_page *oap)
@@ -887,7 +887,7 @@ struct osc_extent {
        /** osc_object of this extent */
        struct osc_object       *oe_obj;
        /** refcount, removed from red-black tree if reaches zero. */
-       atomic_t                oe_refc;
+       struct kref             oe_refc;
        /** busy if non-zero */
        atomic_t                oe_users;
        /** link list of osc_object's oo_{hp|urgent|locking}_exts. */