X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=lustre%2Finclude%2Flinux%2Fobd_ost.h;h=8ad6e6a7ac4a5b29b76987f17f0b796e6a91df4c;hb=6ec7020ec578a881fc619e3ed1751c0d58d19c83;hp=69dcc6051d9f848308dac7cc1d39a86e1bfa8cac;hpb=a7761b65d3fbc41df6a0f9bdfebcc880ea7946ce;p=fs%2Flustre-release.git

diff --git a/lustre/include/linux/obd_ost.h b/lustre/include/linux/obd_ost.h
index 69dcc60..8ad6e6a 100644
--- a/lustre/include/linux/obd_ost.h
+++ b/lustre/include/linux/obd_ost.h
@@ -27,38 +27,16 @@
 #ifndef _LUSTRE_OST_H
 #define _LUSTRE_OST_H
 
-#include <linux/obd_support.h>
+#include <linux/obd_class.h>
 
 #define LUSTRE_OST_NAME "ost"
 #define LUSTRE_OSC_NAME "osc"
 
-struct ost_obd {
-        struct ptlrpc_service *ost_service;
-
-	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, 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, __u32 xid);
-void ost_unpack_niobuf(void **tmp, struct niobuf **nbp);
+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);
-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);
-
-
 
 #endif
-
-