merge b_devel into HEAD. Includes:

[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 f8d1486..9ef7052 100644 (file)
--- a/lustre/include/linux/obd_ost.h
+++ b/lustre/include/linux/obd_ost.h
@@ -35,10 +35,10 @@
 #define LUSTRE_SANOST_NAME "sanost"
 
 /* ost/ost_pack.c */
-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(struct obd_ioobj **ioop, struct lov_stripe_md *oa,int bufcnt);
-void ost_unpack_ioo(struct obd_ioobj **tmp, struct obd_ioobj **ioop);
+void ost_pack_niobuf(struct niobuf_remote *nb, __u64 offset, __u32 len,
+                     __u32 flags, __u32 xid);
+void ost_unpack_niobuf(struct niobuf_remote *dst, struct niobuf_remote *src);
+void ost_pack_ioo(struct obd_ioobj *ioo, struct lov_stripe_md *lsm, int bufcnt);
+void ost_unpack_ioo(struct obd_ioobj *dst, struct obd_ioobj *src);
 
 #endif