X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_cl_internal.h;h=fb5f74d57dbe98d317a69a4d2f6cedb608e91834;hb=9f604f5da06a2aa428388905ca9158b128e5016c;hp=7e0dfe52f896a1740941ede327ddb343409c7126;hpb=51459371a2e146d01f9d2ef27fdf75d77639266f;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_cl_internal.h b/lustre/osc/osc_cl_internal.h
index 7e0dfe5..fb5f74d 100644
--- a/lustre/osc/osc_cl_internal.h
+++ b/lustre/osc/osc_cl_internal.h
@@ -73,7 +73,7 @@ struct osc_io {
         struct obdo        oi_oa;
         struct osc_punch_cbargs {
                 int               opc_rc;
-                struct completion opc_sync;
+                cfs_completion_t  opc_sync;
         } oi_punch_cbarg;
 };
 
@@ -114,17 +114,17 @@ struct osc_object {
          */
         struct cl_io       oo_debug_io;
         /** Serialization object for osc_object::oo_debug_io. */
-        struct mutex       oo_debug_mutex;
+        cfs_mutex_t        oo_debug_mutex;
 #endif
         /**
          * List of pages in transfer.
          */
-        struct list_head   oo_inflight[CRT_NR];
+        cfs_list_t         oo_inflight[CRT_NR];
         /**
          * Lock, protecting ccc_object::cob_inflight, because a seat-belt is
          * locked during take-off and landing.
          */
-        spinlock_t         oo_seatbelt;
+        cfs_spinlock_t     oo_seatbelt;
 };
 
 /*
@@ -281,12 +281,16 @@ struct osc_page {
          * True for a `temporary page' created by read-ahead code, probably
          * outside of any DLM lock.
          */
-                              ops_temp:1;
+                              ops_temp:1,
+        /**
+         * Set if the page must be transferred with OBD_BRW_SRVLOCK.
+         */
+                              ops_srvlock:1;
         /**
          * Linkage into a per-osc_object list of pages in flight. For
          * debugging.
          */
-        struct list_head      ops_inflight;
+        cfs_list_t            ops_inflight;
         /**
          * Thread that submitted this page for transfer. For debugging.
          */