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

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

diff --git a/lustre/include/linux/obd_osc.h b/lustre/include/linux/obd_osc.h
index e99c408..cb3e7f8 100644 (file)
--- a/lustre/include/linux/obd_osc.h
+++ b/lustre/include/linux/obd_osc.h
@@ -24,54 +24,18 @@
  *
  */
 
-#ifndef _LUSTRE_OST_H
-#define _LUSTRE_OST_H
+#ifndef _LUSTRE_OSC_H
+#define _LUSTRE_OSC_H
 
 #include <linux/obd_support.h>
-
-#define OST_EXIT 1
-#define LUSTRE_OST_NAME "ost"
-
-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;
-};
+#include <linux/lustre_net.h>
 
 struct osc_obd {
-       struct obd_device *ost_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 obd_device *osc_tgt;
+        struct ptlrpc_client osc_peer;
 };
 
-/* 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);
+#define OST_EXIT 1
+#define LUSTRE_OST_NAME "ost"
 
 #endif
-
-