Commented-out mdc_statfs method. Not sure of how to set up all the portals

[fs/lustre-release.git] / lustre / lib / obd_pack.c

diff --git a/lustre/lib/obd_pack.c b/lustre/lib/obd_pack.c
index 5b8ad4e..ec4bbbe 100644 (file)
--- a/lustre/lib/obd_pack.c
+++ b/lustre/lib/obd_pack.c
@@ -32,11 +32,11 @@ void ost_pack_ioo(void **tmp, struct obdo *oa, int bufcnt)
         struct obd_ioobj *ioo = *tmp;
         char *c = *tmp;
 
-        ioo->ioo_id = HTON__u64(oa->o_id); 
-        ioo->ioo_gr = HTON__u64(oa->o_gr); 
-        ioo->ioo_type = HTON__u64(oa->o_mode); 
-        ioo->ioo_bufcnt = HTON__u32(bufcnt); 
-        *tmp = c + sizeof(*ioo); 
+        ioo->ioo_id = HTON__u64(oa->o_id);
+        ioo->ioo_gr = HTON__u64(oa->o_gr);
+        ioo->ioo_type = HTON__u32(oa->o_mode);
+        ioo->ioo_bufcnt = HTON__u32(bufcnt);
+        *tmp = c + sizeof(*ioo);
 }
 
 void ost_unpack_ioo(void **tmp, struct obd_ioobj **ioop)
@@ -45,38 +45,36 @@ void ost_unpack_ioo(void **tmp, struct obd_ioobj **ioop)
         struct obd_ioobj *ioo = *tmp;
         *ioop = *tmp;
 
-        ioo->ioo_id = NTOH__u64(ioo->ioo_id); 
-        ioo->ioo_gr = NTOH__u64(ioo->ioo_gr); 
-        ioo->ioo_type = NTOH__u64(ioo->ioo_type); 
-        ioo->ioo_bufcnt = NTOH__u32(ioo->ioo_bufcnt); 
-        *tmp = c + sizeof(*ioo); 
+        ioo->ioo_id = NTOH__u64(ioo->ioo_id);
+        ioo->ioo_gr = NTOH__u64(ioo->ioo_gr);
+        ioo->ioo_type = NTOH__u32(ioo->ioo_type);
+        ioo->ioo_bufcnt = NTOH__u32(ioo->ioo_bufcnt);
+        *tmp = c + sizeof(*ioo);
 }
 
-void ost_pack_niobuf(void **tmp, void *addr, __u64 offset, __u32 len, 
-                     __u32 flags, __u32 xid)
+void ost_pack_niobuf(void **tmp, __u64 offset, __u32 len, __u32 flags,
+                     __u32 xid)
 {
-        struct niobuf *nb = *tmp;
+        struct niobuf_remote *nb = *tmp;
         char *c = *tmp;
 
-        nb->addr = HTON__u64((__u64)(unsigned long)addr); 
-        nb->offset = HTON__u64(offset); 
-        nb->len = HTON__u32(len); 
-        nb->flags = HTON__u32(flags); 
+        nb->offset = HTON__u64(offset);
+        nb->len = HTON__u32(len);
+        nb->flags = HTON__u32(flags);
         nb->xid = HTON__u32(xid);
-        *tmp = c + sizeof(*nb); 
+        *tmp = c + sizeof(*nb);
 }
 
-void ost_unpack_niobuf(void **tmp, struct niobuf **nbp)
+void ost_unpack_niobuf(void **tmp, struct niobuf_remote **nbp)
 {
         char *c = *tmp;
-        struct niobuf *nb = *tmp;
+        struct niobuf_remote *nb = *tmp;
 
         *nbp = *tmp;
 
-        nb->addr = NTOH__u64(nb->addr); 
-        nb->offset = NTOH__u64(nb->offset); 
-        nb->len = NTOH__u32(nb->len); 
-        nb->flags = NTOH__u32(nb->flags); 
+        nb->offset = NTOH__u64(nb->offset);
+        nb->len = NTOH__u32(nb->len);
+        nb->flags = NTOH__u32(nb->flags);
 
-        *tmp = c + sizeof(*nb); 
+        *tmp = c + sizeof(*nb);
 }