From: zab <zab>
Date: Sat, 15 Feb 2003 20:21:34 +0000 (+0000)
Subject: - rebase b_io against HEAD in preparation for the latest write cache code
X-Git-Tag: v1_7_100~1^120~17
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=5a100bef79580fbef41098bda5f16c27eeb74d7e;p=fs%2Flustre-release.git

- 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
--- 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