Merged branch 'peter' with the tip. Pre-merge tag is 't_20020302_networking'.

[fs/lustre-release.git] / lustre / include / linux / obd_ost.h

diff --git a/lustre/include/linux/obd_ost.h b/lustre/include/linux/obd_ost.h
index a53bd37..0609a7f 100644 (file)
--- a/lustre/include/linux/obd_ost.h
+++ b/lustre/include/linux/obd_ost.h
@@ -29,47 +29,24 @@
 
 #include <linux/obd_support.h>
 
-#define OST_EXIT 1
 #define LUSTRE_OST_NAME "ost"
 #define LUSTRE_OSC_NAME "osc"
 
 struct ost_obd {
-       struct obd_device *ost_tgt;
-       struct obd_conn ost_conn;
-       struct task_struct *ost_thread;
-       wait_queue_head_t ost_waitq;
-       wait_queue_head_t ost_done_waitq;
-       int ost_flags;
-       spinlock_t ost_lock;
-       struct list_head ost_reqs;
-
         struct ptlrpc_service *ost_service;
-};
-
-struct ost_request { 
-       struct list_head rq_list;
-       struct ost_obd *rq_obd;
-       int rq_status;
 
-       char *rq_reqbuf;
-       int rq_reqlen;
-       struct ost_req_hdr *rq_reqhdr;
-       struct ost_req *rq_req;
-
-       char *rq_repbuf;
-       int rq_replen;
-       struct ost_rep_hdr *rq_rephdr;
-       struct ost_rep *rq_rep;
-
-        void *rq_reply_handle;
-       wait_queue_head_t rq_wait_for_rep;
+       struct obd_device *ost_tgt;
+       struct obd_conn ost_conn;
 };
 
 /* ost/ost_pack.c */
-int ost_pack_req(char *buf1, int buflen1, char *buf2, int buflen2, struct ptlreq_hdr **hdr, struct ost_req **req, int *len, char **buf);
-int ost_unpack_req(char *buf, int len, struct ptlreq_hdr **hdr, struct ost_req **req);
-int ost_pack_rep(void *buf1, __u32 buflen1, void *buf2, __u32 buflen2, struct ptlrep_hdr **hdr, struct ost_rep **rep, int *len, char **buf);
-int ost_unpack_rep(char *buf, int len, struct ptlrep_hdr **hdr, struct ost_rep **rep);
+int ost_pack_req(char *buf1, int buflen1, char *buf2, int buflen2, struct ptlreq_hdr **hdr, union ptl_req *req, int *len, char **buf);
+int ost_unpack_req(char *buf, int len, struct ptlreq_hdr **hdr, union ptl_req *req);
+int ost_pack_rep(char *buf1, int buflen1, char *buf2, int buflen2,
+                struct ptlrep_hdr **hdr, union ptl_rep *r,
+                int *len, char **buf);
+int ost_unpack_rep(char *buf, int len, struct ptlrep_hdr **hdr, union ptl_rep *rep);
+
 void ost_pack_niobuf(void **tmp, void *addr, __u64 offset, __u32 len, 
                    __u32 flags);
 void ost_unpack_niobuf(void **tmp, struct niobuf **nbp);