Update b_orphan from HEAD (20040130_1601)

[fs/lustre-release.git] / lustre / obdclass / debug.c

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index 8b28706..04d17b9 100644 (file)
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -1,33 +1,52 @@
 /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
  * vim:expandtab:shiftwidth=8:tabstop=8:
  *
- * Helper routines for dumping data structs for debugging.
+ *  Copyright (C) 2002 Cluster File Systems, Inc.
+ *
+ *   This file is part of Lustre, http://www.lustre.org.
+ *
+ *   Lustre is free software; you can redistribute it and/or
+ *   modify it under the terms of version 2 of the GNU General Public
+ *   License as published by the Free Software Foundation.
  *
- * This code is issued under the GNU General Public License.
- * See the file COPYING in this distribution
+ *   Lustre is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *   GNU General Public License for more details.
  *
- * Copryright (C) 2002 Cluster File Systems, Inc.
+ *   You should have received a copy of the GNU General Public License
+ *   along with Lustre; if not, write to the Free Software
+ *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
+ * Helper routines for dumping data structs for debugging.
  */
 
 #define DEBUG_SUBSYSTEM D_OTHER
 
-#define EXPORT_SYMTAB
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#ifndef __KERNEL__
+# include <liblustre.h>
+#endif
+
 #include <linux/obd_ost.h>
+#include <linux/obd_support.h>
 #include <linux/lustre_debug.h>
 #include <linux/lustre_net.h>
 
 int dump_ioo(struct obd_ioobj *ioo)
 {
-        CERROR("obd_ioobj: ioo_id="LPD64", ioo_gr="LPD64", ioo_type=%d, ioo_bufct=%d\n",
+        CERROR("obd_ioobj: ioo_id="LPD64", ioo_gr="LPD64", ioo_type=%d, "
+               "ioo_bufct=%d\n",
                ioo->ioo_id, ioo->ioo_gr, ioo->ioo_type, ioo->ioo_bufcnt);
         return -EINVAL;
 }
 
 int dump_lniobuf(struct niobuf_local *nb)
 {
-        CERROR("niobuf_local: addr=%p, offset="LPD64", len=%d, xid=%d, page=%p\n",
-               nb->addr, nb->offset, nb->len, nb->xid, nb->page);
+        CERROR("niobuf_local: offset="LPD64", len=%d, page=%p, rc=%d\n",
+               nb->offset, nb->len, nb->page, nb->rc);
         CERROR("nb->page: index = %ld\n", nb->page ? nb->page->index : -1);
 
         return -EINVAL;
@@ -35,8 +54,8 @@ int dump_lniobuf(struct niobuf_local *nb)
 
 int dump_rniobuf(struct niobuf_remote *nb)
 {
-        CERROR("niobuf_remote: offset="LPD64", len=%d, flags=%x, xid=%d\n",
-               nb->offset, nb->len, nb->flags, nb->xid);
+        CERROR("niobuf_remote: offset="LPU64", len=%d, flags=%x\n",
+               nb->offset, nb->len, nb->flags);
 
         return -EINVAL;
 }
@@ -65,15 +84,15 @@ int dump_obdo(struct obdo *oa)
                        oa->o_mode & ((valid & OBD_MD_FLTYPE ?  S_IFMT : 0) |
                                      (valid & OBD_MD_FLMODE ? ~S_IFMT : 0)));
         if (valid & OBD_MD_FLUID)
-                CERROR("obdo: o_uid = %d\n", oa->o_uid);
+                CERROR("obdo: o_uid = %u\n", oa->o_uid);
         if (valid & OBD_MD_FLGID)
-                CERROR("obdo: o_gid = %d\n", oa->o_gid);
+                CERROR("obdo: o_gid = %u\n", oa->o_gid);
         if (valid & OBD_MD_FLFLAGS)
                 CERROR("obdo: o_flags = %x\n", oa->o_flags);
         if (valid & OBD_MD_FLNLINK)
-                CERROR("obdo: o_nlink = %d\n", oa->o_nlink);
+                CERROR("obdo: o_nlink = %u\n", oa->o_nlink);
         if (valid & OBD_MD_FLGENER)
-                CERROR("obdo: o_generation = %d\n", oa->o_generation);
+                CERROR("obdo: o_generation = %u\n", oa->o_generation);
 
         return -EINVAL;
 }
@@ -99,8 +118,8 @@ int page_debug_setup(void *addr, int len, __u64 off, __u64 id)
 {
         LASSERT(addr);
 
-        off = HTON__u64(off);
-        id = HTON__u64(id);
+        off = cpu_to_le64 (off);
+        id = cpu_to_le64 (id);
         memcpy(addr, (char *)&off, LPDS);
         memcpy(addr + LPDS, (char *)&id, LPDS);
 
@@ -118,28 +137,28 @@ int page_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
 
         LASSERT(addr);
 
-        ne_off = HTON__u64(off);
-        id = HTON__u64(id);
+        ne_off = le64_to_cpu (off);
+        id = le64_to_cpu (id);
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CERROR("%s: id "LPU64" offset "LPU64" off: "LPX64" != "LPX64"\n",
-                       who, id, off, *(__u64 *)addr, ne_off);
+                CERROR("%s: id "LPX64" offset "LPU64" off: "LPX64" != "
+                       LPX64"\n", who, id, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CERROR("%s: id "LPU64" offset "LPU64" id: "LPX64" != "LPX64"\n",
+                CERROR("%s: id "LPX64" offset "LPU64" id: "LPX64" != "LPX64"\n",
                        who, id, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }
 
         addr += end - LPDS - LPDS;
         if (memcmp(addr, (char *)&ne_off, LPDS)) {
-                CERROR("%s: id "LPU64" offset "LPU64" end off: "LPX64" != "LPX64"\n",
-                       who, id, off, *(__u64 *)addr, ne_off);
+                CERROR("%s: id "LPX64" offset "LPU64" end off: "LPX64" != "
+                       LPX64"\n", who, id, off, *(__u64 *)addr, ne_off);
                 err = -EINVAL;
         }
         if (memcmp(addr + LPDS, (char *)&id, LPDS)) {
-                CERROR("%s: id "LPU64" offset "LPU64" end id: "LPX64" != "LPX64"\n",
-                       who, id, off, *(__u64 *)(addr + LPDS), id);
+                CERROR("%s: id "LPX64" offset "LPU64" end id: "LPX64" != "
+                       LPX64"\n", who, id, off, *(__u64 *)(addr + LPDS), id);
                 err = -EINVAL;
         }