Land b_orphan on HEAD (20040130_1601)

[fs/lustre-release.git] / lustre / osc / osc_internal.h

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index 30dae54..d78c8bf 100644 (file)
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_internal.h
@@ -12,6 +12,7 @@
 
 #include <portals/lib-types.h> /* for PTL_MTU and PTL_MD_MAX_PAGES */
 
+
 /* bug 1578: negotiate BRW_MAX_SIZE with the OST, instead of hard-coding it */
 #define OSC_BRW_MAX_SIZE PTL_MTU
 #define OSC_BRW_MAX_IOV PTL_MD_MAX_PAGES
@@ -32,7 +33,12 @@ struct osc_async_page {
         obd_flag                oap_brw_flags;
         enum async_flags        oap_async_flags;
 
+        unsigned long           oap_interrupted:1;
         struct obd_sync_io_container *oap_osic;
+        struct osic_callback_context oap_occ;
+        struct ptlrpc_request   *oap_request;
+        struct client_obd       *oap_cli;
+        struct lov_oinfo        *oap_loi;
 
        struct obd_async_page_ops *oap_caller_ops;
         void                   *oap_caller_data;
@@ -47,20 +53,11 @@ int osc_create(struct obd_export *exp, struct obdo *oa,
 int osc_real_create(struct obd_export *exp, struct obdo *oa,
               struct lov_stripe_md **ea, struct obd_trans_info *oti);
 void oscc_init(struct obd_export *exp);
-void osc_adjust_cache(struct client_obd *cli);
 
 #ifdef __KERNEL__
-
 int lproc_osc_attach_seqstat(struct obd_device *dev);
-void lproc_osc_hist(struct osc_histogram *oh, unsigned int value);
-void lproc_osc_hist_pow2(struct osc_histogram *oh, unsigned int value);
-
-#else /* !__KERNEL__ */
-
-#define lproc_osc_attach_seqstat(dev) (0)
-#define lproc_osc_hist(o,v) do{}while(0)
-#define lproc_osc_hist_pow2(o, v) do{}while(0)
-
+#else
+static inline int lproc_osc_attach_seqstat(struct obd_device *dev) {}
 #endif
 
 #endif /* OSC_INTERNAL_H */