X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fobdclass%2Fdebug.c;h=7d3d313648066a35b8e6162d716f16c235c7a6c7;hb=6957329b064f72db289ae93d0a7776cb9faa3961;hp=8b287067cf34fb68e020d2e83e2fcb52bbce3acb;hpb=b00e39dd57f226e3f9f07bd69c299744badc0bc0;p=fs%2Flustre-release.git diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c index 8b28706..7d3d313 100644 --- a/lustre/obdclass/debug.c +++ b/lustre/obdclass/debug.c @@ -1,42 +1,64 @@ /* -*- 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 the Lustre file system, http://www.lustre.org + * Lustre is a trademark of Cluster File Systems, Inc. + * + * You may have signed or agreed to another license before downloading + * this software. If so, you are bound by the terms and conditions + * of that agreement, and the following does not apply to you. See the + * LICENSE file included with this distribution for more information. * - * This code is issued under the GNU General Public License. - * See the file COPYING in this distribution + * If you did not agree to a different license, then this copy of Lustre + * is open source 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. * - * Copryright (C) 2002 Cluster File Systems, Inc. + * In either case, 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 + * license text for more details. * + * Helper routines for dumping data structs for debugging. */ #define DEBUG_SUBSYSTEM D_OTHER -#define EXPORT_SYMTAB -#include -#include -#include +#ifndef EXPORT_SYMTAB +# define EXPORT_SYMTAB +#endif +#ifndef __KERNEL__ +# include +#endif + +#include +#include +#include +#include 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("nb->page: index = %ld\n", nb->page ? nb->page->index : -1); + 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 ? cfs_page_index(nb->page) : -1); return -EINVAL; } 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,19 +87,27 @@ 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; } +void dump_lsm(int level, struct lov_stripe_md *lsm) +{ + CDEBUG(level, "lsm %p, objid "LPX64", maxbytes "LPX64", magic 0x%08X, " + "stripe_size %u, stripe_count %u\n", lsm, + lsm->lsm_object_id, lsm->lsm_maxbytes, lsm->lsm_magic, + lsm->lsm_stripe_size, lsm->lsm_stripe_count); +} + /* XXX assumes only a single page in request */ /* int dump_req(struct ptlrpc_request *req) @@ -95,12 +125,12 @@ 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); - 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); @@ -111,35 +141,35 @@ 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; 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); + CDEBUG(D_ERROR, "%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", + CDEBUG(D_ERROR, "%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); + CDEBUG(D_ERROR, "%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); + CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" end id: "LPX64" != " + LPX64"\n", who, id, off, *(__u64 *)(addr + LPDS), id); err = -EINVAL; } @@ -152,5 +182,6 @@ 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(dump_lsm); +EXPORT_SYMBOL(block_debug_setup); +EXPORT_SYMBOL(block_debug_check);