X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fobdclass%2Fdebug.c;h=a80cd2c42e155ffac22207722d8eee525f08edd8;hp=9a04d7e483ac77b76e46d24ae106cf8499dda8e3;hb=82dff34569766e08218c395c04f428530ff7726e;hpb=95d394d59bbccbc92af076c985fd664719f8fe12 diff --git a/lustre/obdclass/debug.c b/lustre/obdclass/debug.c index 9a04d7e..a80cd2c 100644 --- a/lustre/obdclass/debug.c +++ b/lustre/obdclass/debug.c @@ -1,22 +1,39 @@ /* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- * vim:expandtab:shiftwidth=8:tabstop=8: * - * Copyright (C) 2002 Cluster File Systems, Inc. + * GPL HEADER START * - * This file is part of Lustre, http://www.lustre.org. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * 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 program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 only, + * as published by the Free Software Foundation. * - * 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. + * This program 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 version 2 for more details (a copy is included + * in the LICENSE file that accompanied this code). * - * 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. + * You should have received a copy of the GNU General Public License + * version 2 along with this program; If not, see + * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf + * + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, + * CA 95054 USA or visit www.sun.com if you need additional information or + * have any questions. + * + * GPL HEADER END + */ +/* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Use is subject to license terms. + */ +/* + * This file is part of Lustre, http://www.lustre.org/ + * Lustre is a trademark of Sun Microsystems, Inc. + * + * lustre/obdclass/debug.c * * Helper routines for dumping data structs for debugging. */ @@ -30,10 +47,10 @@ # include #endif -#include -#include -#include -#include +#include +#include +#include +#include int dump_ioo(struct obd_ioobj *ioo) { @@ -47,7 +64,7 @@ int dump_lniobuf(struct niobuf_local *nb) { 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); + CERROR("nb->page: index = %ld\n", nb->page ? cfs_page_index(nb->page) : -1); return -EINVAL; } @@ -62,9 +79,9 @@ int dump_rniobuf(struct niobuf_remote *nb) int dump_obdo(struct obdo *oa) { - __u64 valid = oa->o_valid; + __u32 valid = oa->o_valid; - CERROR("obdo: o_valid = "LPX64"\n", valid); + CERROR("obdo: o_valid = %08x\n", valid); if (valid & OBD_MD_FLID) CERROR("obdo: o_id = "LPD64"\n", oa->o_id); if (valid & OBD_MD_FLATIME) @@ -88,7 +105,7 @@ int dump_obdo(struct obdo *oa) if (valid & OBD_MD_FLGID) CERROR("obdo: o_gid = %u\n", oa->o_gid); if (valid & OBD_MD_FLFLAGS) - CERROR("obdo: o_flags = 0x%x\n", oa->o_flags); + CERROR("obdo: o_flags = %x\n", oa->o_flags); if (valid & OBD_MD_FLNLINK) CERROR("obdo: o_nlink = %u\n", oa->o_nlink); if (valid & OBD_MD_FLGENER) @@ -97,6 +114,15 @@ int dump_obdo(struct obdo *oa) 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 pool "LOV_POOLNAMEF"\n", lsm, + lsm->lsm_object_id, lsm->lsm_maxbytes, lsm->lsm_magic, + lsm->lsm_stripe_size, lsm->lsm_stripe_count, + lsm->lsm_pool_name); +} + /* XXX assumes only a single page in request */ /* int dump_req(struct ptlrpc_request *req) @@ -140,24 +166,24 @@ int block_debug_check(char *who, void *addr, int end, __u64 off, __u64 id) ne_off = le64_to_cpu (off); id = le64_to_cpu (id); if (memcmp(addr, (char *)&ne_off, LPDS)) { - CERROR("%s: id "LPX64" offset "LPU64" off: "LPX64" != " + 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 "LPX64" 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 "LPX64" offset "LPU64" end off: "LPX64" != " + 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 "LPX64" offset "LPU64" end id: "LPX64" != " + CDEBUG(D_ERROR, "%s: id "LPX64" offset "LPU64" end id: "LPX64" != " LPX64"\n", who, id, off, *(__u64 *)(addr + LPDS), id); err = -EINVAL; } @@ -171,5 +197,6 @@ EXPORT_SYMBOL(dump_rniobuf); EXPORT_SYMBOL(dump_ioo); //EXPORT_SYMBOL(dump_req); EXPORT_SYMBOL(dump_obdo); +EXPORT_SYMBOL(dump_lsm); EXPORT_SYMBOL(block_debug_setup); EXPORT_SYMBOL(block_debug_check);