X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fosc%2Fosc_internal.h;h=227e7c854b33f63a6119027502983ef116cbcd30;hb=30964bcc157e3ad76714b7e55491112c3ae8ebad;hp=30dae54217756bd9e43f1c0ea51a8bb842f0176b;hpb=5e54279d5d30d14d6499152741df9db55597722f;p=fs%2Flustre-release.git

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index 30dae54..227e7c8 100644
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_internal.h
@@ -10,12 +10,6 @@
 #ifndef OSC_INTERNAL_H
 #define OSC_INTERNAL_H
 
-#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
-
 #define OAP_MAGIC 8675309
 
 struct osc_async_page {
@@ -29,38 +23,50 @@ struct osc_async_page {
         obd_off                 oap_obj_off;
         obd_off                 oap_page_off;
         int                     oap_count;
-        obd_flag                oap_brw_flags;
+        obd_flags                oap_brw_flags;
         enum async_flags        oap_async_flags;
 
-        struct obd_sync_io_container *oap_osic;
+        unsigned long           oap_interrupted:1;
+        struct obd_io_group      *oap_oig;
+        struct oig_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;
 };
 
-#define OSCC_FLAG_RECOVERING 1
-#define OSCC_FLAG_CREATING   2
-#define OSCC_FLAG_NOSPC      4 /* can't create more objects on this OST */
+#define OAP_FROM_COOKIE(c)                                                      \
+        (LASSERT(((struct osc_async_page *)(c))->oap_magic == OAP_MAGIC),       \
+         (struct osc_async_page *)(c))
+
+struct osc_cache_waiter {
+        struct list_head        ocw_entry;
+        wait_queue_head_t       ocw_waitq;
+        struct osc_async_page   *ocw_oap;
+        int                     ocw_rc;
+};
+
+#define OSCC_FLAG_RECOVERING         0x01
+#define OSCC_FLAG_CREATING           0x02
+#define OSCC_FLAG_NOSPC              0x04 /* can't create more objects on OST */
+#define OSCC_FLAG_SYNC_IN_PROGRESS   0x08 /* only allow one thread to sync */
+#define OSCC_FLAG_LOW                0x10
+#define OSCC_FLAG_EXITING            0x20
 
 int osc_create(struct obd_export *exp, struct obdo *oa,
+               void *acl, int acl_size,
 	       struct lov_stripe_md **ea, struct obd_trans_info *oti);
 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);
+void oscc_init(struct obd_device *obd);
+void osc_wake_cache_waiters(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) {return 0;}
 #endif
 
 #endif /* OSC_INTERNAL_H */