land b1_5 onto HEAD

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

diff --git a/lustre/osc/osc_internal.h b/lustre/osc/osc_internal.h
index 227e7c8..18148c8 100644 (file)
--- a/lustre/osc/osc_internal.h
+++ b/lustre/osc/osc_internal.h
@@ -1,10 +1,5 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
- *
- * Copyright (C) 2003 Cluster File Systems, Inc.
- *
- * This code is issued under the GNU General Public License.
- * See the file COPYING in this distribution
  */
 
 #ifndef OSC_INTERNAL_H
@@ -14,36 +9,40 @@
 
 struct osc_async_page {
         int                     oap_magic;
+        unsigned short          oap_cmd;
+        unsigned short          oap_interrupted:1;
+
         struct list_head        oap_pending_item;
         struct list_head        oap_urgent_item;
         struct list_head        oap_rpc_item;
-        struct page             *oap_page;
-        int                     oap_cmd;
 
         obd_off                 oap_obj_off;
-        obd_off                 oap_page_off;
-        int                     oap_count;
-        obd_flags                oap_brw_flags;
+        unsigned                oap_page_off;
         enum async_flags        oap_async_flags;
 
-        unsigned long           oap_interrupted:1;
-        struct obd_io_group      *oap_oig;
+        struct brw_page         oap_brw_page;
+
         struct oig_callback_context oap_occ;
+        struct obd_io_group     *oap_oig;
         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;
+        void                    *oap_caller_data;
 };
 
-#define OAP_FROM_COOKIE(c)                                                      \
-        (LASSERT(((struct osc_async_page *)(c))->oap_magic == OAP_MAGIC),       \
+#define oap_page        oap_brw_page.pg
+#define oap_count       oap_brw_page.count
+#define oap_brw_flags   oap_brw_page.flag
+
+#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;
+        cfs_waitq_t             ocw_waitq;
         struct osc_async_page   *ocw_oap;
         int                     ocw_rc;
 };
@@ -56,17 +55,21 @@ struct osc_cache_waiter {
 #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_device *obd);
 void osc_wake_cache_waiters(struct client_obd *cli);
 
-#ifdef __KERNEL__
+#ifdef LPROCFS
 int lproc_osc_attach_seqstat(struct obd_device *dev);
 #else
 static inline int lproc_osc_attach_seqstat(struct obd_device *dev) {return 0;}
 #endif
 
+#ifndef min_t
+#define min_t(type,x,y) \
+        ({ type __x = (x); type __y = (y); __x < __y ? __x: __y; })
+#endif
+
 #endif /* OSC_INTERNAL_H */