- rebase b_io against HEAD in preparation for the latest write cache code

diff --git a/lustre/include/linux/obd_ost.h b/lustre/include/linux/obd_ost.h
index e999451..5de0a25 100644 (file)
--- a/lustre/include/linux/obd_ost.h
+++ b/lustre/include/linux/obd_ost.h
@@ -36,7 +36,7 @@
 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 lov_stripe_md *oa, int bufcnt);
-void ost_unpack_ioo(void **tmp, struct obd_ioobj **ioop);
+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);
 
 #endif