file export-do_kern_mount.patch was initially added on branch b1_5.

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

diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c
index f824b98..9a04d7e 100644 (file)
--- a/lustre/obdclass/debug.c
+++ b/lustre/obdclass/debug.c
@@ -23,7 +23,9 @@
 
 #define DEBUG_SUBSYSTEM D_OTHER
 
-#define EXPORT_SYMTAB
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
 #ifndef __KERNEL__
 # include <liblustre.h>
 #endif
@@ -60,9 +62,9 @@ int dump_rniobuf(struct niobuf_remote *nb)
 
 int dump_obdo(struct obdo *oa)
 {
-        __u32 valid = oa->o_valid;
+        __u64 valid = oa->o_valid;
 
-        CERROR("obdo: o_valid = %08x\n", valid);
+        CERROR("obdo: o_valid = "LPX64"\n", valid);
         if (valid & OBD_MD_FLID)
                 CERROR("obdo: o_id = "LPD64"\n", oa->o_id);
         if (valid & OBD_MD_FLATIME)
@@ -82,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);
+                CERROR("obdo: o_flags = 0x%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;
 }
@@ -112,7 +114,7 @@ int dump_req(struct ptlrpc_request *req)
 */
 
 #define LPDS sizeof(__u64)
-int page_debug_setup(void *addr, int len, __u64 off, __u64 id)
+int block_debug_setup(void *addr, int len, __u64 off, __u64 id)
 {
         LASSERT(addr);
 
@@ -128,7 +130,7 @@ int page_debug_setup(void *addr, int len, __u64 off, __u64 id)
         return 0;
 }
 
-int page_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
+int block_debug_check(char *who, void *addr, int end, __u64 off, __u64 id)
 {
         __u64 ne_off;
         int err = 0;
@@ -169,5 +171,5 @@ EXPORT_SYMBOL(dump_rniobuf);
 EXPORT_SYMBOL(dump_ioo);
 //EXPORT_SYMBOL(dump_req);
 EXPORT_SYMBOL(dump_obdo);
-EXPORT_SYMBOL(page_debug_setup);
-EXPORT_SYMBOL(page_debug_check);
+EXPORT_SYMBOL(block_debug_setup);
+EXPORT_SYMBOL(block_debug_check);