X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lustre%2Fosp%2Flproc_osp.c;h=68adc7a8cec89dbadbe3e6f1fd3f3b7349f360f3;hp=ea79310d3e28cceceb3a665e14b50c5f914536f6;hb=59f0fe02b84a058072bcb19c2ded351fa8e81b15;hpb=496e925db0d4d0be728390398101e4d3a5983086 diff --git a/lustre/osp/lproc_osp.c b/lustre/osp/lproc_osp.c index ea79310..68adc7a 100644 --- a/lustre/osp/lproc_osp.c +++ b/lustre/osp/lproc_osp.c @@ -15,11 +15,7 @@ * * 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. + * http://www.gnu.org/licenses/gpl-2.0.html * * GPL HEADER END */ @@ -27,7 +23,7 @@ * Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved. * Use is subject to license terms. * - * Copyright (c) 2011, 2012, Intel, Inc. + * Copyright (c) 2012, 2013, 2014 Intel Corporation. */ /* * This file is part of Lustre, http://www.lustre.org/ @@ -35,7 +31,7 @@ * * lustre/osp/lproc_osp.c * - * Lustre OST Proxy Device, procfs functions + * Lustre OST Proxy Device (OSP), procfs functions * * Author: Alex Zhuravlev */ @@ -45,24 +41,42 @@ #include "osp_internal.h" #ifdef LPROCFS -static int osp_rd_active(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show OSP active status + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_active_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; int rc; LPROCFS_CLIMP_CHECK(dev); - rc = snprintf(page, count, "%d\n", - !dev->u.cli.cl_import->imp_deactive); + rc = seq_printf(m, "%d\n", !dev->u.cli.cl_import->imp_deactive); LPROCFS_CLIMP_EXIT(dev); return rc; } -static int osp_wr_active(struct file *file, const char *buffer, - unsigned long count, void *data) +/** + * Activate/Deactivate OSP + * + * \param[in] file proc file + * \param[in] buffer string, which is "1" or "0" to activate/deactivate OSP + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t +osp_active_seq_write(struct file *file, const char *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; - int val, rc; + struct seq_file *m = file->private_data; + struct obd_device *dev = m->private; + int val, rc; rc = lprocfs_write_helper(buffer, count, &val); if (rc) @@ -81,67 +95,132 @@ static int osp_wr_active(struct file *file, const char *buffer, LPROCFS_CLIMP_EXIT(dev); return count; } +LPROC_SEQ_FOPS(osp_active); -static int osp_rd_syn_in_flight(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show number of RPCs in flight + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_syn_in_flight_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - int rc; if (osp == NULL) return -EINVAL; - rc = snprintf(page, count, "%u\n", osp->opd_syn_rpc_in_flight); - return rc; + return seq_printf(m, "%u\n", osp->opd_syn_rpc_in_flight); } +LPROC_SEQ_FOPS_RO(osp_syn_in_flight); -static int osp_rd_syn_in_prog(char *page, char **start, off_t off, int count, - int *eof, void *data) +/** + * Show number of RPCs in processing (including uncommitted by OST) + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_syn_in_prog_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - int rc; if (osp == NULL) return -EINVAL; - rc = snprintf(page, count, "%u\n", osp->opd_syn_rpc_in_progress); - return rc; + return seq_printf(m, "%u\n", osp->opd_syn_rpc_in_progress); } +LPROC_SEQ_FOPS_RO(osp_syn_in_prog); -static int osp_rd_syn_changes(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show number of changes to sync + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_syn_changes_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - int rc; if (osp == NULL) return -EINVAL; - rc = snprintf(page, count, "%lu\n", osp->opd_syn_changes); - return rc; + return seq_printf(m, "%lu\n", osp->opd_syn_changes); } -static int osp_rd_max_rpcs_in_flight(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Sync changes + * + * \param[in] file proc file + * \param[in] buffer unused because any input will do + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t osp_syn_changes_seq_write(struct file *file, const char *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; - struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); + struct seq_file *m = file->private_data; + struct obd_device *dev = m->private; + struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); + struct lu_env env; int rc; + rc = lu_env_init(&env, LCT_LOCAL); + if (rc != 0) + return rc; + + rc = dt_sync(&env, &osp->opd_dt_dev); + lu_env_fini(&env); + + return rc == 0 ? count : rc; +} +LPROC_SEQ_FOPS(osp_syn_changes); + +/** + * Show maximum number of RPCs in flight allowed + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_max_rpcs_in_flight_seq_show(struct seq_file *m, void *data) +{ + struct obd_device *dev = m->private; + struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); + if (osp == NULL) return -EINVAL; - rc = snprintf(page, count, "%u\n", osp->opd_syn_max_rpc_in_flight); - return rc; + return seq_printf(m, "%u\n", osp->opd_syn_max_rpc_in_flight); } -static int osp_wr_max_rpcs_in_flight(struct file *file, const char *buffer, - unsigned long count, void *data) +/** + * Change maximum number of RPCs in flight allowed + * + * \param[in] file proc file + * \param[in] buffer string which represents maximum number + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t +osp_max_rpcs_in_flight_seq_write(struct file *file, const char *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; + struct seq_file *m = file->private_data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); int val, rc; @@ -158,25 +237,43 @@ static int osp_wr_max_rpcs_in_flight(struct file *file, const char *buffer, osp->opd_syn_max_rpc_in_flight = val; return count; } +LPROC_SEQ_FOPS(osp_max_rpcs_in_flight); -static int osp_rd_max_rpcs_in_prog(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show maximum number of RPCs in processing allowed + * + * \param[in] m seq_file handle + * \param[in] data unused + * \retval 0 on success + * \retval negative number on error + */ +static int osp_max_rpcs_in_prog_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - int rc; if (osp == NULL) return -EINVAL; - rc = snprintf(page, count, "%u\n", osp->opd_syn_max_rpc_in_progress); - return rc; + return seq_printf(m, "%u\n", osp->opd_syn_max_rpc_in_progress); } -static int osp_wr_max_rpcs_in_prog(struct file *file, const char *buffer, - unsigned long count, void *data) +/** + * Change maximum number of RPCs in processing allowed + * + * \param[in] file proc file + * \param[in] buffer string which represents maximum number + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t +osp_max_rpcs_in_prog_seq_write(struct file *file, const char *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; + struct seq_file *m = file->private_data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); int val, rc; @@ -194,27 +291,47 @@ static int osp_wr_max_rpcs_in_prog(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(osp_max_rpcs_in_prog); -static int osp_rd_create_count(char *page, char **start, off_t off, int count, - int *eof, void *data) +/** + * Show number of objects to precreate next time + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_create_count_seq_show(struct seq_file *m, void *data) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return 0; - return snprintf(page, count, "%d\n", osp->opd_pre_grow_count); + return seq_printf(m, "%d\n", osp->opd_pre_grow_count); } -static int osp_wr_create_count(struct file *file, const char *buffer, - unsigned long count, void *data) +/** + * Change number of objects to precreate next time + * + * \param[in] file proc file + * \param[in] buffer string which represents number of objects to precreate + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t +osp_create_count_seq_write(struct file *file, const char *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; + struct seq_file *m = file->private_data; + struct obd_device *obd = m->private; struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); int val, rc, i; - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return 0; rc = lprocfs_write_helper(buffer, count, &val); @@ -242,27 +359,47 @@ static int osp_wr_create_count(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(osp_create_count); -static int osp_rd_max_create_count(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show maximum number of objects to precreate + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_max_create_count_seq_show(struct seq_file *m, void *data) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return 0; - return snprintf(page, count, "%d\n", osp->opd_pre_max_grow_count); + return seq_printf(m, "%d\n", osp->opd_pre_max_grow_count); } -static int osp_wr_max_create_count(struct file *file, const char *buffer, - unsigned long count, void *data) +/** + * Change maximum number of objects to precreate + * + * \param[in] file proc file + * \param[in] buffer string which represents maximum number + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t +osp_max_create_count_seq_write(struct file *file, const char *buffer, + size_t count, loff_t *off) { - struct obd_device *obd = data; + struct seq_file *m = file->private_data; + struct obd_device *obd = m->private; struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); int val, rc; - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return 0; rc = lprocfs_write_helper(buffer, count, &val); @@ -281,61 +418,144 @@ static int osp_wr_max_create_count(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(osp_max_create_count); -static int osp_rd_prealloc_next_id(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show last id to assign in creation + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_prealloc_next_id_seq_show(struct seq_file *m, void *data) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return 0; - return snprintf(page, count, LPU64"\n", osp->opd_pre_used_id + 1); + return seq_printf(m, "%u\n", fid_oid(&osp->opd_pre_used_fid) + 1); } +LPROC_SEQ_FOPS_RO(osp_prealloc_next_id); -static int osp_rd_prealloc_last_id(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show last created id OST reported + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_prealloc_last_id_seq_show(struct seq_file *m, void *data) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return 0; - return snprintf(page, count, LPU64"\n", osp->opd_pre_last_created); + return seq_printf(m, "%u\n", fid_oid(&osp->opd_pre_last_created_fid)); } +LPROC_SEQ_FOPS_RO(osp_prealloc_last_id); -static int osp_rd_prealloc_reserved(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show next FID sequence to precreate + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_prealloc_next_seq_seq_show(struct seq_file *m, void *data) { - struct obd_device *obd = data; + struct obd_device *obd = m->private; struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return 0; - return snprintf(page, count, LPU64"\n", osp->opd_pre_reserved); + return seq_printf(m, LPX64"\n", fid_seq(&osp->opd_pre_used_fid)); } +LPROC_SEQ_FOPS_RO(osp_prealloc_next_seq); -static int osp_rd_maxage(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show last created FID sequence OST reported + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_prealloc_last_seq_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *obd = m->private; + struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); + + if (osp == NULL || osp->opd_pre == NULL) + return 0; + + return seq_printf(m, LPX64"\n", + fid_seq(&osp->opd_pre_last_created_fid)); +} +LPROC_SEQ_FOPS_RO(osp_prealloc_last_seq); + +/** + * Show the number of ids reserved by declare + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_prealloc_reserved_seq_show(struct seq_file *m, void *data) +{ + struct obd_device *obd = m->private; + struct osp_device *osp = lu2osp_dev(obd->obd_lu_dev); + + if (osp == NULL || osp->opd_pre == NULL) + return 0; + + return seq_printf(m, LPU64"\n", osp->opd_pre_reserved); +} +LPROC_SEQ_FOPS_RO(osp_prealloc_reserved); + +/** + * Show interval (in seconds) to update statfs data + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_maxage_seq_show(struct seq_file *m, void *data) +{ + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - int rc; if (osp == NULL) return -EINVAL; - rc = snprintf(page, count, "%u\n", osp->opd_statfs_maxage); - return rc; + return seq_printf(m, "%u\n", osp->opd_statfs_maxage); } -static int osp_wr_maxage(struct file *file, const char *buffer, - unsigned long count, void *data) +/** + * Change interval to update statfs data + * + * \param[in] file proc file + * \param[in] buffer string which represents statfs interval (in seconds) + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t +osp_maxage_seq_write(struct file *file, const char *buffer, + size_t count, loff_t *off) { - struct obd_device *dev = data; + struct seq_file *m = file->private_data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); int val, rc; @@ -353,149 +573,279 @@ static int osp_wr_maxage(struct file *file, const char *buffer, return count; } +LPROC_SEQ_FOPS(osp_maxage); -static int osp_rd_pre_status(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show current precreation status: output 0 means success, otherwise negative + * number is printed + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_pre_status_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - int rc; - if (osp == NULL) + if (osp == NULL || osp->opd_pre == NULL) return -EINVAL; - rc = snprintf(page, count, "%d\n", osp->opd_pre_status); - return rc; + return seq_printf(m, "%d\n", osp->opd_pre_status); } +LPROC_SEQ_FOPS_RO(osp_pre_status); -static int osp_rd_destroys_in_flight(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show the number of RPCs in processing (including uncommitted by OST) plus + * changes to sync, i.e. this is the total number of changes OST needs to apply + * and commit. + * + * This counter is used to determine if OST has space returned. A zero value + * indicates that OST storage space consumed by destroyed objects has been freed + * on disk, the associated llog records have been cleared, and no synchronous + * RPC are being processed. + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_destroys_in_flight_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - /* - * This counter used to determine if OST has space returned. - * Now we need to wait for the following: - * - sync changes are zero - no llog records - * - sync in progress are zero - no RPCs in flight - */ - return snprintf(page, count, "%lu\n", - osp->opd_syn_rpc_in_progress + osp->opd_syn_changes); + if (osp == NULL) + return -EINVAL; + + return seq_printf(m, "%lu\n", + osp->opd_syn_rpc_in_progress + osp->opd_syn_changes); } +LPROC_SEQ_FOPS_RO(osp_destroys_in_flight); -static int osp_rd_old_sync_processed(char *page, char **start, off_t off, - int count, int *eof, void *data) +/** + * Show changes synced from previous mount + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_old_sync_processed_seq_show(struct seq_file *m, void *data) { - struct obd_device *dev = data; + struct obd_device *dev = m->private; struct osp_device *osp = lu2osp_dev(dev->obd_lu_dev); - int rc; if (osp == NULL) return -EINVAL; - rc = snprintf(page, count, "%d\n", osp->opd_syn_prev_done); - return rc; + return seq_printf(m, "%d\n", osp->opd_syn_prev_done); +} +LPROC_SEQ_FOPS_RO(osp_old_sync_processed); + +/** + * Show maximum number of RPCs in flight + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int +osp_lfsck_max_rpcs_in_flight_seq_show(struct seq_file *m, void *data) +{ + struct obd_device *dev = m->private; + __u32 max; + + max = obd_get_max_rpcs_in_flight(&dev->u.cli); + return seq_printf(m, "%u\n", max); } -static struct lprocfs_vars lprocfs_osp_obd_vars[] = { - { "uuid", lprocfs_rd_uuid, 0, 0 }, - { "ping", 0, lprocfs_wr_ping, 0, 0, 0222 }, - { "connect_flags", lprocfs_rd_connect_flags, 0, 0 }, - { "ost_server_uuid", lprocfs_rd_server_uuid, 0, 0 }, - { "ost_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 }, - { "active", osp_rd_active, osp_wr_active, 0 }, - { "max_rpcs_in_flight", osp_rd_max_rpcs_in_flight, - osp_wr_max_rpcs_in_flight, 0 }, - { "max_rpcs_in_progress", osp_rd_max_rpcs_in_prog, - osp_wr_max_rpcs_in_prog, 0 }, - { "create_count", osp_rd_create_count, - osp_wr_create_count, 0 }, - { "max_create_count", osp_rd_max_create_count, - osp_wr_max_create_count, 0 }, - { "prealloc_next_id", osp_rd_prealloc_next_id, 0, 0 }, - { "prealloc_last_id", osp_rd_prealloc_last_id, 0, 0 }, - { "prealloc_reserved", osp_rd_prealloc_reserved, 0, 0 }, - { "timeouts", lprocfs_rd_timeouts, 0, 0 }, - { "import", lprocfs_rd_import, lprocfs_wr_import, 0 }, - { "state", lprocfs_rd_state, 0, 0 }, - { "maxage", osp_rd_maxage, osp_wr_maxage, 0 }, - { "prealloc_status", osp_rd_pre_status, 0, 0 }, - { "sync_changes", osp_rd_syn_changes, 0, 0 }, - { "sync_in_flight", osp_rd_syn_in_flight, 0, 0 }, - { "sync_in_progress", osp_rd_syn_in_prog, 0, 0 }, - { "old_sync_processed", osp_rd_old_sync_processed, 0, 0 }, +/** + * Change maximum number of RPCs in flight + * + * \param[in] file proc file + * \param[in] buffer string which represents maximum number of RPCs in flight + * \param[in] count \a buffer length + * \param[in] off unused for single entry + * \retval \a count on success + * \retval negative number on error + */ +static ssize_t +osp_lfsck_max_rpcs_in_flight_seq_write(struct file *file, + const char __user *buffer, + size_t count, loff_t *off) +{ + struct seq_file *m = file->private_data; + struct obd_device *dev = m->private; + int val; + int rc; - /* for compatibility reasons */ - { "destroys_in_flight", osp_rd_destroys_in_flight, 0, 0 }, - { 0 } -}; + rc = lprocfs_write_helper(buffer, count, &val); + if (rc == 0) + rc = obd_set_max_rpcs_in_flight(&dev->u.cli, val); + + if (rc != 0) + count = rc; + + return count; +} +LPROC_SEQ_FOPS(osp_lfsck_max_rpcs_in_flight); + +LPROC_SEQ_FOPS_WO_TYPE(osp, ping); +LPROC_SEQ_FOPS_RO_TYPE(osp, uuid); +LPROC_SEQ_FOPS_RO_TYPE(osp, connect_flags); +LPROC_SEQ_FOPS_RO_TYPE(osp, server_uuid); +LPROC_SEQ_FOPS_RO_TYPE(osp, conn_uuid); + +/** + * Show maximum pages per bulk RPC + * + * \param[in] m seq_file handle + * \param[in] data unused for single entry + * \retval 0 on success + * \retval negative number on error + */ +static int osp_max_pages_per_rpc_seq_show(struct seq_file *m, void *v) +{ + return lprocfs_obd_max_pages_per_rpc_seq_show(m, m->private); +} +LPROC_SEQ_FOPS_RO(osp_max_pages_per_rpc); +LPROC_SEQ_FOPS_RO_TYPE(osp, timeouts); + +LPROC_SEQ_FOPS_RW_TYPE(osp, import); +LPROC_SEQ_FOPS_RO_TYPE(osp, state); + +static struct lprocfs_seq_vars lprocfs_osp_obd_vars[] = { + { .name = "uuid", + .fops = &osp_uuid_fops }, + { .name = "ping", + .fops = &osp_ping_fops, + .proc_mode = 0222 }, + { .name = "connect_flags", + .fops = &osp_connect_flags_fops }, + { .name = "ost_server_uuid", + .fops = &osp_server_uuid_fops }, + { .name = "ost_conn_uuid", + .fops = &osp_conn_uuid_fops }, + { .name = "active", + .fops = &osp_active_fops }, + { .name = "max_rpcs_in_flight", + .fops = &osp_max_rpcs_in_flight_fops }, + { .name = "max_rpcs_in_progress", + .fops = &osp_max_rpcs_in_prog_fops }, + { .name = "create_count", + .fops = &osp_create_count_fops }, + { .name = "max_create_count", + .fops = &osp_max_create_count_fops }, + { .name = "prealloc_next_id", + .fops = &osp_prealloc_next_id_fops }, + { .name = "prealloc_next_seq", + .fops = &osp_prealloc_next_seq_fops }, + { .name = "prealloc_last_id", + .fops = &osp_prealloc_last_id_fops }, + { .name = "prealloc_last_seq", + .fops = &osp_prealloc_last_seq_fops }, + { .name = "prealloc_reserved", + .fops = &osp_prealloc_reserved_fops }, + { .name = "timeouts", + .fops = &osp_timeouts_fops }, + { .name = "import", + .fops = &osp_import_fops }, + { .name = "state", + .fops = &osp_state_fops }, + { .name = "maxage", + .fops = &osp_maxage_fops }, + { .name = "prealloc_status", + .fops = &osp_pre_status_fops }, + { .name = "sync_changes", + .fops = &osp_syn_changes_fops }, + { .name = "sync_in_flight", + .fops = &osp_syn_in_flight_fops }, + { .name = "sync_in_progress", + .fops = &osp_syn_in_prog_fops }, + { .name = "old_sync_processed", + .fops = &osp_old_sync_processed_fops }, -static struct lprocfs_vars lprocfs_osp_osd_vars[] = { - { "blocksize", lprocfs_osd_rd_blksize, 0, 0 }, - { "kbytestotal", lprocfs_osd_rd_kbytestotal, 0, 0 }, - { "kbytesfree", lprocfs_osd_rd_kbytesfree, 0, 0 }, - { "kbytesavail", lprocfs_osd_rd_kbytesavail, 0, 0 }, - { "filestotal", lprocfs_osd_rd_filestotal, 0, 0 }, - { "filesfree", lprocfs_osd_rd_filesfree, 0, 0 }, + /* for compatibility reasons */ + { .name = "destroys_in_flight", + .fops = &osp_destroys_in_flight_fops }, + { .name = "lfsck_max_rpcs_in_flight", + .fops = &osp_lfsck_max_rpcs_in_flight_fops }, { 0 } }; -static struct lprocfs_vars lprocfs_osp_module_vars[] = { - { "num_refs", lprocfs_rd_numrefs, 0, 0 }, +LPROC_SEQ_FOPS_RO_TYPE(osp, dt_blksize); +LPROC_SEQ_FOPS_RO_TYPE(osp, dt_kbytestotal); +LPROC_SEQ_FOPS_RO_TYPE(osp, dt_kbytesfree); +LPROC_SEQ_FOPS_RO_TYPE(osp, dt_kbytesavail); +LPROC_SEQ_FOPS_RO_TYPE(osp, dt_filestotal); +LPROC_SEQ_FOPS_RO_TYPE(osp, dt_filesfree); + +static struct lprocfs_seq_vars lprocfs_osp_osd_vars[] = { + { .name = "blocksize", + .fops = &osp_dt_blksize_fops }, + { .name = "kbytestotal", + .fops = &osp_dt_kbytestotal_fops }, + { .name = "kbytesfree", + .fops = &osp_dt_kbytesfree_fops }, + { .name = "kbytesavail", + .fops = &osp_dt_kbytesavail_fops }, + { .name = "filestotal", + .fops = &osp_dt_filestotal_fops }, + { .name = "filesfree", + .fops = &osp_dt_filesfree_fops }, { 0 } }; -void lprocfs_osp_init_vars(struct lprocfs_static_vars *lvars) -{ - lvars->module_vars = lprocfs_osp_module_vars; - lvars->obd_vars = lprocfs_osp_obd_vars; -} - +/** + * Initialize OSP lprocfs + * + * param[in] osp OSP device + */ void osp_lprocfs_init(struct osp_device *osp) { struct obd_device *obd = osp->opd_obd; - struct proc_dir_entry *osc_proc_dir; + struct proc_dir_entry *osc_proc_dir = NULL; + struct obd_type *type; int rc; - obd->obd_proc_entry = lprocfs_register(obd->obd_name, - obd->obd_type->typ_procroot, - lprocfs_osp_osd_vars, - &osp->opd_dt_dev); - if (IS_ERR(obd->obd_proc_entry)) { - CERROR("%s: can't register in lprocfs: %ld\n", - obd->obd_name, PTR_ERR(obd->obd_proc_entry)); - obd->obd_proc_entry = NULL; + obd->obd_vars = lprocfs_osp_obd_vars; + if (lprocfs_seq_obd_setup(obd) != 0) return; - } - rc = lprocfs_add_vars(obd->obd_proc_entry, lprocfs_osp_obd_vars, obd); + rc = lprocfs_seq_add_vars(obd->obd_proc_entry, lprocfs_osp_osd_vars, + &osp->opd_dt_dev); if (rc) { - CERROR("%s: can't register in lprocfs: %ld\n", - obd->obd_name, PTR_ERR(obd->obd_proc_entry)); + CERROR("%s: can't register in lprocfs, rc %d\n", + obd->obd_name, rc); return; } ptlrpc_lprocfs_register_obd(obd); + if (osp->opd_connect_mdt || !strstr(obd->obd_name, "osc")) + return; + + /* If the real OSC is present which is the case for setups + * with both server and clients on the same node then use + * the OSC's proc root */ + type = class_search_type(LUSTRE_OSC_NAME); + if (type != NULL && type->typ_procroot != NULL) + osc_proc_dir = type->typ_procroot; + else + osc_proc_dir = obd->obd_type->typ_procsym; + + if (osc_proc_dir == NULL) + return; + /* for compatibility we link old procfs's OSC entries to osp ones */ - osc_proc_dir = lprocfs_srch(proc_lustre_root, "osc"); - if (osc_proc_dir) { - cfs_proc_dir_entry_t *symlink = NULL; - char *name; - - OBD_ALLOC(name, strlen(obd->obd_name) + 1); - if (name == NULL) - return; - - strcpy(name, obd->obd_name); - if (strstr(name, "osc")) - symlink = lprocfs_add_symlink(name, osc_proc_dir, - "../osp/%s", - obd->obd_name); - OBD_FREE(name, strlen(obd->obd_name) + 1); - osp->opd_symlink = symlink; - } + osp->opd_symlink = lprocfs_add_symlink(obd->obd_name, osc_proc_dir, + "../osp/%s", obd->obd_name); + if (osp->opd_symlink == NULL) + CERROR("could not register OSC symlink for " + "/proc/fs/lustre/osp/%s.", obd->obd_name); } #endif /* LPROCFS */