Changes to request processing:

[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..da00eca 100644 (file)
--- a/lustre/include/linux/obd_ost.h
+++ b/lustre/include/linux/obd_ost.h
@@ -48,51 +48,21 @@ 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 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);
+void ost_pack_niobuf(void **tmp, void *addr, __u64 offset, __u32 len, 
+                   __u32 flags);
+void ost_unpack_niobuf(void **tmp, struct niobuf **nbp);
+void ost_pack_ioo(void **tmp, struct obdo *oa, int bufcnt);
+void *ost_req_buf2(struct ost_req *req);
+void *ost_req_buf1(struct ost_req *req);
+void *ost_rep_buf2(struct ost_rep *rep);
+void *ost_rep_buf1(struct ost_rep *rep);
 
 
-/* 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);
 
 #endif