- compilation fixes.

[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 98581dd..8ad6e6a 100644 (file)
--- a/lustre/include/linux/obd_ost.h
+++ b/lustre/include/linux/obd_ost.h
@@ -27,73 +27,16 @@
 #ifndef _LUSTRE_OST_H
 #define _LUSTRE_OST_H
 
-#include <linux/obd_support.h>
+#include <linux/obd_class.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 osc_obd {
-       struct obd_device *osc_tgt;
-};
-
-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 ost_req { 
-       __u32   connid;
-       __u32   cmd; 
-       struct obdo oa;
-       __u32   buflen1;
-       __u32   buflen2;
-       char *buf1;
-       char *buf2;
-};
-
-struct ost_rep {
-       __u32   result;
-       __u32   connid;
-       struct obdo oa;
-       __u32   buflen1;
-       __u32   buflen2;
-       char *   buf1;
-       char *   buf2;
-};
-
-
 /* ost/ost_pack.c */
-int ost_pack_req(char *buf1, int buflen1, char *buf2, int buflen2, struct ost_req_hdr **hdr, struct ost_req **req, int *len, char **buf);
-int ost_unpack_req(char *buf, int len, struct ost_req_hdr **hdr, struct ost_req **req);
-int ost_pack_rep(void *buf1, __u32 buflen1, void *buf2, __u32 buflen2, struct ost_rep_hdr **hdr, struct ost_rep **rep, int *len, char **buf);
-int ost_unpack_rep(char *buf, int len, struct ost_rep_hdr **hdr, struct ost_rep **rep);
+void ost_pack_niobuf(void **tmp, __u64 offset, __u32 len, __u32 flags,
+                     __u32 xid);
+void ost_unpack_niobuf(void **tmp, struct niobuf_remote **nbp);
+void ost_pack_ioo(void **tmp, struct obdo *oa, int bufcnt);
+void ost_unpack_ioo(void **tmp, struct obd_ioobj **ioop);
 
 #endif
-
-