X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fmdc%2Flproc_mdc.c;h=3eaf776d5ff6d8fb58b2512488f25a9fda8854ee;hp=f55ab4637256a37ff4a5f07b1c1f4fd1310511c6;hb=e49995acfd026f3ca85d05dc1b91d97a8743fe72;hpb=f907343dc34ac32bde1a56030d9994fa024a2874 diff --git a/lustre/mdc/lproc_mdc.c b/lustre/mdc/lproc_mdc.c index f55ab46..3eaf776 100644 --- a/lustre/mdc/lproc_mdc.c +++ b/lustre/mdc/lproc_mdc.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. @@ -26,8 +24,10 @@ * GPL HEADER END */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved + * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. + * + * Copyright (c) 2011, 2014, Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -39,129 +39,109 @@ #include #include #include -#include - -#ifdef LPROCFS - -static int mdc_rd_max_rpcs_in_flight(char *page, char **start, off_t off, - int count, int *eof, void *data) -{ - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int rc; - - client_obd_list_lock(&cli->cl_loi_list_lock); - rc = snprintf(page, count, "%u\n", cli->cl_max_rpcs_in_flight); - client_obd_list_unlock(&cli->cl_loi_list_lock); - return rc; -} - -static int mdc_wr_max_rpcs_in_flight(struct file *file, const char *buffer, - unsigned long count, void *data) -{ - struct obd_device *dev = data; - struct client_obd *cli = &dev->u.cli; - int val, rc; - - rc = lprocfs_write_helper(buffer, count, &val); - if (rc) - return rc; - if (val < 1 || val > MDC_MAX_RIF_MAX) - return -ERANGE; +#include "mdc_internal.h" - client_obd_list_lock(&cli->cl_loi_list_lock); - cli->cl_max_rpcs_in_flight = val; - client_obd_list_unlock(&cli->cl_loi_list_lock); - - return count; -} +#ifdef LPROCFS -static int mdc_changelog_seq_release(struct inode *inode, struct file *file) +static int mdc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v) { - struct seq_file *seq = file->private_data; - struct changelog_seq_iter *csi = seq->private; + struct obd_device *dev = m->private; + __u32 max; + int rc; - if (csi && csi->csi_llh) - llog_cat_put(csi->csi_llh); - if (csi && csi->csi_ctxt) - llog_ctxt_put(csi->csi_ctxt); + max = obd_get_max_rpcs_in_flight(&dev->u.cli); + rc = seq_printf(m, "%u\n", max); - return (changelog_seq_release(inode, file)); + return rc; } -static int mdc_changelog_seq_open(struct inode *inode, struct file *file) +static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file, + const char __user *buffer, + size_t count, + loff_t *off) { - struct changelog_seq_iter *csi; - int rc; - ENTRY; + struct obd_device *dev = ((struct seq_file *)file->private_data)->private; + int val; + int rc; - rc = changelog_seq_open(inode, file, &csi); - if (rc) - RETURN(rc); + rc = lprocfs_write_helper(buffer, count, &val); + if (rc == 0) + rc = obd_set_max_rpcs_in_flight(&dev->u.cli, val); - /* Set up the remote catalog handle */ - /* Note the proc file is set up with obd in data, not mdc_device */ - csi->csi_ctxt = llog_get_context((struct obd_device *)csi->csi_dev, - LLOG_CHANGELOG_REPL_CTXT); - if (csi->csi_ctxt == NULL) - GOTO(out, rc = -ENOENT); - rc = llog_create(csi->csi_ctxt, &csi->csi_llh, NULL, CHANGELOG_CATALOG); - if (rc) { - CERROR("llog_create() failed %d\n", rc); - GOTO(out, rc); - } - rc = llog_init_handle(csi->csi_llh, LLOG_F_IS_CAT, NULL); - if (rc) { - CERROR("llog_init_handle failed %d\n", rc); - GOTO(out, rc); - } + if (rc != 0) + count = rc; -out: - if (rc) - mdc_changelog_seq_release(inode, file); - RETURN(rc); + return count; } - -static struct file_operations mdc_changelog_fops = { - .owner = THIS_MODULE, - .open = mdc_changelog_seq_open, - .read = seq_read, - .llseek = changelog_seq_lseek, - .release = mdc_changelog_seq_release, -}; - - -static struct lprocfs_vars lprocfs_mdc_obd_vars[] = { - { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "ping", 0, lprocfs_wr_ping, 0, 0, 0222 }, - { "connect_flags", lprocfs_rd_connect_flags, 0, 0 }, - { "blocksize", lprocfs_rd_blksize, 0, 0 }, - { "kbytestotal", lprocfs_rd_kbytestotal, 0, 0 }, - { "kbytesfree", lprocfs_rd_kbytesfree, 0, 0 }, - { "kbytesavail", lprocfs_rd_kbytesavail, 0, 0 }, - { "filestotal", lprocfs_rd_filestotal, 0, 0 }, - { "filesfree", lprocfs_rd_filesfree, 0, 0 }, - /*{ "filegroups", lprocfs_rd_filegroups, 0, 0 },*/ - { "mds_server_uuid", lprocfs_rd_server_uuid, 0, 0 }, - { "mds_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 }, - { "max_rpcs_in_flight", mdc_rd_max_rpcs_in_flight, - mdc_wr_max_rpcs_in_flight, 0 }, - { "timeouts", lprocfs_rd_timeouts, 0, 0 }, - { "import", lprocfs_rd_import, 0, 0 }, - { "state", lprocfs_rd_state, 0, 0 }, - { "changelog", 0, 0, 0, &mdc_changelog_fops, 0400 }, - { 0 } -}; - -static struct lprocfs_vars lprocfs_mdc_module_vars[] = { - { "num_refs", lprocfs_rd_numrefs, 0, 0 }, - { 0 } -}; - -void lprocfs_mdc_init_vars(struct lprocfs_static_vars *lvars) +LPROC_SEQ_FOPS(mdc_max_rpcs_in_flight); + +LPROC_SEQ_FOPS_WO_TYPE(mdc, ping); + +LPROC_SEQ_FOPS_RO_TYPE(mdc, uuid); +LPROC_SEQ_FOPS_RO_TYPE(mdc, connect_flags); +LPROC_SEQ_FOPS_RO_TYPE(mdc, blksize); +LPROC_SEQ_FOPS_RO_TYPE(mdc, kbytestotal); +LPROC_SEQ_FOPS_RO_TYPE(mdc, kbytesfree); +LPROC_SEQ_FOPS_RO_TYPE(mdc, kbytesavail); +LPROC_SEQ_FOPS_RO_TYPE(mdc, filestotal); +LPROC_SEQ_FOPS_RO_TYPE(mdc, filesfree); +LPROC_SEQ_FOPS_RO_TYPE(mdc, server_uuid); +LPROC_SEQ_FOPS_RO_TYPE(mdc, conn_uuid); +LPROC_SEQ_FOPS_RO_TYPE(mdc, timeouts); +LPROC_SEQ_FOPS_RO_TYPE(mdc, state); + +static int mdc_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *v) { - lvars->module_vars = lprocfs_mdc_module_vars; - lvars->obd_vars = lprocfs_mdc_obd_vars; + return lprocfs_obd_max_pages_per_rpc_seq_show(m, m->private); } +LPROC_SEQ_FOPS_RO(mdc_obd_max_pages_per_rpc); + +LPROC_SEQ_FOPS_RW_TYPE(mdc, import); +LPROC_SEQ_FOPS_RW_TYPE(mdc, pinger_recov); + +struct lprocfs_seq_vars lprocfs_mdc_obd_vars[] = { + { .name = "uuid", + .fops = &mdc_uuid_fops }, + { .name = "ping", + .fops = &mdc_ping_fops, + .proc_mode = 0222 }, + { .name = "connect_flags", + .fops = &mdc_connect_flags_fops }, + { .name = "blocksize", + .fops = &mdc_blksize_fops }, + { .name = "kbytestotal", + .fops = &mdc_kbytestotal_fops }, + { .name = "kbytesfree", + .fops = &mdc_kbytesfree_fops }, + { .name = "kbytesavail", + .fops = &mdc_kbytesavail_fops }, + { .name = "filestotal", + .fops = &mdc_filestotal_fops }, + { .name = "filesfree", + .fops = &mdc_filesfree_fops }, + { .name = "mds_server_uuid", + .fops = &mdc_server_uuid_fops }, + { .name = "mds_conn_uuid", + .fops = &mdc_conn_uuid_fops }, + /* + * FIXME: below proc entry is provided, but not in used, instead + * sbi->sb_md_brw_size is used, the per obd variable should be used + * when CMD is enabled, and dir pages are managed in MDC layer. + * Remember to enable proc write function. + */ + { .name = "max_pages_per_rpc", + .fops = &mdc_obd_max_pages_per_rpc_fops }, + { .name = "max_rpcs_in_flight", + .fops = &mdc_max_rpcs_in_flight_fops }, + { .name = "timeouts", + .fops = &mdc_timeouts_fops }, + { .name = "import", + .fops = &mdc_import_fops }, + { .name = "state", + .fops = &mdc_state_fops }, + { .name = "pinger_recov", + .fops = &mdc_pinger_recov_fops }, + { NULL } +}; #endif /* LPROCFS */