X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Flmv%2Flproc_lmv.c;h=b2c407062d74e4d84b80e8c8384b9bbcc2856464;hb=4c0dcdf290c8f3fc74a2585e976d7fc430bc79c4;hp=d15f419074f3629bc080350d50c45858288bb3e6;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git diff --git a/lustre/lmv/lproc_lmv.c b/lustre/lmv/lproc_lmv.c index d15f419..b2c4070 100644 --- a/lustre/lmv/lproc_lmv.c +++ b/lustre/lmv/lproc_lmv.c @@ -1,6 +1,4 @@ -/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*- - * vim:expandtab:shiftwidth=8:tabstop=8: - * +/* * GPL HEADER START * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -16,8 +14,8 @@ * in the LICENSE file that accompanied this code). * * You should have received a copy of the GNU General Public License - * version 2 along with this program; If not, see [sun.com URL with a - * copy of GPLv2]. + * 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 @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2012, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -42,54 +42,61 @@ #include #include -#ifndef LPROCFS +#include "lmv_internal.h" + +#ifndef CONFIG_PROC_FS static struct lprocfs_vars lprocfs_module_vars[] = { {0} }; static struct lprocfs_vars lprocfs_obd_vars[] = { {0} }; #else -static int lmv_rd_numobd(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int lmv_numobd_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = (struct obd_device*)data; - struct lmv_desc *desc; + struct obd_device *dev = (struct obd_device *)m->private; + struct lmv_desc *desc; LASSERT(dev != NULL); desc = &dev->u.lmv.desc; - *eof = 1; - return snprintf(page, count, "%u\n", desc->ld_tgt_count); - + seq_printf(m, "%u\n", desc->ld_tgt_count); + return 0; } +LPROC_SEQ_FOPS_RO(lmv_numobd); -static int lmv_rd_activeobd(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int lmv_activeobd_seq_show(struct seq_file *m, void *v) { - struct obd_device* dev = (struct obd_device*)data; - struct lmv_desc *desc; + struct obd_device *dev = (struct obd_device *)m->private; + struct lmv_desc *desc; LASSERT(dev != NULL); desc = &dev->u.lmv.desc; - *eof = 1; - return snprintf(page, count, "%u\n", desc->ld_active_tgt_count); + seq_printf(m, "%u\n", desc->ld_active_tgt_count); + return 0; } +LPROC_SEQ_FOPS_RO(lmv_activeobd); -static int lmv_rd_desc_uuid(char *page, char **start, off_t off, int count, - int *eof, void *data) +static int lmv_desc_uuid_seq_show(struct seq_file *m, void *v) { - struct obd_device *dev = (struct obd_device*) data; - struct lmv_obd *lmv; + struct obd_device *dev = (struct obd_device*)m->private; + struct lmv_obd *lmv; LASSERT(dev != NULL); lmv = &dev->u.lmv; - *eof = 1; - return snprintf(page, count, "%s\n", lmv->desc.ld_uuid.uuid); + seq_printf(m, "%s\n", lmv->desc.ld_uuid.uuid); + return 0; } +LPROC_SEQ_FOPS_RO(lmv_desc_uuid); static void *lmv_tgt_seq_start(struct seq_file *p, loff_t *pos) { - struct obd_device *dev = p->private; - struct lmv_obd *lmv = &dev->u.lmv; + struct obd_device *dev = p->private; + struct lmv_obd *lmv = &dev->u.lmv; + + while (*pos < lmv->tgts_size) { + if (lmv->tgts[*pos] != NULL) + return lmv->tgts[*pos]; - return (*pos >= lmv->desc.ld_tgt_count) ? NULL : &(lmv->tgts[*pos]); + ++*pos; + } + return NULL; } static void lmv_tgt_seq_stop(struct seq_file *p, void *v) @@ -99,70 +106,71 @@ static void lmv_tgt_seq_stop(struct seq_file *p, void *v) static void *lmv_tgt_seq_next(struct seq_file *p, void *v, loff_t *pos) { - struct obd_device *dev = p->private; - struct lmv_obd *lmv = &dev->u.lmv; + struct obd_device *dev = p->private; + struct lmv_obd *lmv = &dev->u.lmv; + + ++*pos; + while (*pos < lmv->tgts_size) { + if (lmv->tgts[*pos] != NULL) + return lmv->tgts[*pos]; + + ++*pos; + } - ++*pos; - return (*pos >=lmv->desc.ld_tgt_count) ? NULL : &(lmv->tgts[*pos]); + return NULL; } static int lmv_tgt_seq_show(struct seq_file *p, void *v) { - struct lmv_tgt_desc *tgt = v; - struct obd_device *dev = p->private; - struct lmv_obd *lmv = &dev->u.lmv; - int idx = tgt - &(lmv->tgts[0]); - - return seq_printf(p, "%d: %s %sACTIVE\n", idx, tgt->ltd_uuid.uuid, - tgt->ltd_active ? "" : "IN"); + struct lmv_tgt_desc *tgt = v; + + if (tgt == NULL) + return 0; + seq_printf(p, "%u: %s %sACTIVE\n", tgt->ltd_idx, + tgt->ltd_uuid.uuid, tgt->ltd_active ? "" : "IN"); + return 0; } -struct seq_operations lmv_tgt_sops = { - .start = lmv_tgt_seq_start, - .stop = lmv_tgt_seq_stop, - .next = lmv_tgt_seq_next, - .show = lmv_tgt_seq_show, +static const struct seq_operations lmv_tgt_sops = { + .start = lmv_tgt_seq_start, + .stop = lmv_tgt_seq_stop, + .next = lmv_tgt_seq_next, + .show = lmv_tgt_seq_show, }; static int lmv_target_seq_open(struct inode *inode, struct file *file) { - struct proc_dir_entry *dp = PDE(inode); - struct seq_file *seq; - int rc = seq_open(file, &lmv_tgt_sops); + struct seq_file *seq; + int rc; + rc = seq_open(file, &lmv_tgt_sops); if (rc) return rc; - seq = file->private_data; - seq->private = dp->data; - - return 0; + seq = file->private_data; + seq->private = PDE_DATA(inode); + return 0; } -struct lprocfs_vars lprocfs_lmv_obd_vars[] = { - { "numobd", lmv_rd_numobd, 0, 0 }, - { "activeobd", lmv_rd_activeobd, 0, 0 }, - { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "desc_uuid", lmv_rd_desc_uuid, 0, 0 }, - { 0 } -}; +LPROC_SEQ_FOPS_RO_TYPE(lmv, uuid); -static struct lprocfs_vars lprocfs_lmv_module_vars[] = { - { "num_refs", lprocfs_rd_numrefs, 0, 0 }, - { 0 } +struct lprocfs_vars lprocfs_lmv_obd_vars[] = { + { .name = "numobd", + .fops = &lmv_numobd_fops }, + { .name = "activeobd", + .fops = &lmv_activeobd_fops }, + { .name = "uuid", + .fops = &lmv_uuid_fops }, + { .name = "desc_uuid", + .fops = &lmv_desc_uuid_fops }, + { NULL } }; struct file_operations lmv_proc_target_fops = { - .owner = THIS_MODULE, - .open = lmv_target_seq_open, - .read = seq_read, - .llseek = seq_lseek, - .release = seq_release, + .owner = THIS_MODULE, + .open = lmv_target_seq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, }; - -#endif /* LPROCFS */ -void lprocfs_lmv_init_vars(struct lprocfs_static_vars *lvars) -{ - lvars->module_vars = lprocfs_lmv_module_vars; - lvars->obd_vars = lprocfs_lmv_obd_vars; -} +#endif /* CONFIG_PROC_FS */