#ifdef LPROCFS
-static int mdc_rd_max_rpcs_in_flight(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int mdc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
- struct client_obd *cli = &dev->u.cli;
- int rc;
+ struct obd_device *dev = m->private;
+ 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;
+ client_obd_list_lock(&cli->cl_loi_list_lock);
+ rc = seq_printf(m, "%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)
+static ssize_t mdc_max_rpcs_in_flight_seq_write(struct file *file,
+ const char *buffer,
+ size_t count,
+ loff_t *off)
{
- struct obd_device *dev = data;
+ struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &dev->u.cli;
int val, rc;
return count;
}
+LPROC_SEQ_FOPS(mdc_max_rpcs_in_flight);
-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 },
- /*
- * 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.
- */
- { "max_pages_per_rpc", lprocfs_obd_rd_max_pages_per_rpc,
- /* lprocfs_obd_wr_max_pages_per_rpc */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, lprocfs_wr_import, 0 },
- { "state", lprocfs_rd_state, 0, 0 },
- { "pinger_recov", lprocfs_rd_pinger_recov,
- lprocfs_wr_pinger_recov, 0, 0 },
- { 0 }
-};
+LPROC_SEQ_FOPS_WO_TYPE(mdc, ping);
-static struct lprocfs_vars lprocfs_mdc_module_vars[] = {
- { "num_refs", lprocfs_rd_numrefs, 0, 0 },
- { 0 }
-};
+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);
-void lprocfs_mdc_init_vars(struct lprocfs_static_vars *lvars)
+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[] = {
+ { "uuid", &mdc_uuid_fops, 0, 0 },
+ { "ping", &mdc_ping_fops, 0, 0222 },
+ { "connect_flags", &mdc_connect_flags_fops,0, 0 },
+ { "blocksize", &mdc_blksize_fops, 0, 0 },
+ { "kbytestotal", &mdc_kbytestotal_fops, 0, 0 },
+ { "kbytesfree", &mdc_kbytesfree_fops, 0, 0 },
+ { "kbytesavail", &mdc_kbytesavail_fops, 0, 0 },
+ { "filestotal", &mdc_filestotal_fops, 0, 0 },
+ { "filesfree", &mdc_filesfree_fops, 0, 0 },
+ { "mds_server_uuid", &mdc_server_uuid_fops, 0, 0 },
+ { "mds_conn_uuid", &mdc_conn_uuid_fops, 0, 0 },
+ /*
+ * 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.
+ */
+ { "max_pages_per_rpc", &mdc_obd_max_pages_per_rpc_fops },
+ { "max_rpcs_in_flight", &mdc_max_rpcs_in_flight_fops },
+ { "timeouts", &mdc_timeouts_fops },
+ { "import", &mdc_import_fops },
+ { "state", &mdc_state_fops },
+ { "pinger_recov", &mdc_pinger_recov_fops },
+ { 0 }
+};
#endif /* LPROCFS */
#include "osc_internal.h"
#ifdef LPROCFS
-static int osc_rd_active(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_active_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
- int rc;
+ 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);
- LPROCFS_CLIMP_EXIT(dev);
- return rc;
+ LPROCFS_CLIMP_CHECK(dev);
+ rc = seq_printf(m, "%d\n", !dev->u.cli.cl_import->imp_deactive);
+ LPROCFS_CLIMP_EXIT(dev);
+ return rc;
}
-static int osc_wr_active(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_active_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *dev = data;
- int val, rc;
+ struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
+ int val, rc;
rc = lprocfs_write_helper(buffer, count, &val);
if (rc)
return count;
}
+LPROC_SEQ_FOPS(osc_active);
-static int osc_rd_max_rpcs_in_flight(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_max_rpcs_in_flight_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
- struct client_obd *cli = &dev->u.cli;
- int rc;
+ struct obd_device *dev = m->private;
+ 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;
+ client_obd_list_lock(&cli->cl_loi_list_lock);
+ rc = seq_printf(m, "%u\n", cli->cl_max_rpcs_in_flight);
+ client_obd_list_unlock(&cli->cl_loi_list_lock);
+ return rc;
}
-static int osc_wr_max_rpcs_in_flight(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_max_rpcs_in_flight_seq_write(struct file *file,
+ const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *dev = data;
+ struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &dev->u.cli;
struct ptlrpc_request_pool *pool = cli->cl_import->imp_rq_pool;
int val, rc;
LPROCFS_CLIMP_EXIT(dev);
return count;
}
+LPROC_SEQ_FOPS(osc_max_rpcs_in_flight);
-static int osc_rd_max_dirty_mb(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int osc_max_dirty_mb_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
+ struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli;
long val;
int mult;
val = cli->cl_dirty_max;
client_obd_list_unlock(&cli->cl_loi_list_lock);
- mult = 1 << 20;
- return lprocfs_read_frac_helper(page, count, val, mult);
+ mult = 1 << 20;
+ return lprocfs_seq_read_frac_helper(m, val, mult);
}
-static int osc_wr_max_dirty_mb(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_max_dirty_mb_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *dev = data;
+ struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &dev->u.cli;
int pages_number, mult, rc;
return count;
}
+LPROC_SEQ_FOPS(osc_max_dirty_mb);
-static int osc_rd_cached_mb(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int osc_cached_mb_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
+ struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli;
int shift = 20 - PAGE_CACHE_SHIFT;
int rc;
- rc = snprintf(page, count,
+ rc = seq_printf(m,
"used_mb: %d\n"
"busy_cnt: %d\n",
(cfs_atomic_read(&cli->cl_lru_in_list) +
}
/* shrink the number of caching pages to a specific number */
-static int osc_wr_cached_mb(struct file *file, const char *buffer,
- unsigned long nob, void *data)
+static ssize_t
+osc_cached_mb_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *dev = data;
+ struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &dev->u.cli;
int pages_number, mult, rc;
- size_t count = nob;
mult = 1 << (20 - PAGE_CACHE_SHIFT);
buffer = lprocfs_find_named_value(buffer, "used_mb:", &count);
return count;
}
+LPROC_SEQ_FOPS(osc_cached_mb);
-static int osc_rd_cur_dirty_bytes(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_cur_dirty_bytes_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
- struct client_obd *cli = &dev->u.cli;
- int rc;
+ struct obd_device *dev = m->private;
+ struct client_obd *cli = &dev->u.cli;
+ int rc;
- client_obd_list_lock(&cli->cl_loi_list_lock);
- rc = snprintf(page, count, "%lu\n", cli->cl_dirty);
- client_obd_list_unlock(&cli->cl_loi_list_lock);
- return rc;
+ client_obd_list_lock(&cli->cl_loi_list_lock);
+ rc = seq_printf(m, "%lu\n", cli->cl_dirty);
+ client_obd_list_unlock(&cli->cl_loi_list_lock);
+ return rc;
}
+LPROC_SEQ_FOPS_RO(osc_cur_dirty_bytes);
-static int osc_rd_cur_grant_bytes(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_cur_grant_bytes_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
- struct client_obd *cli = &dev->u.cli;
- int rc;
+ struct obd_device *dev = m->private;
+ struct client_obd *cli = &dev->u.cli;
+ int rc;
- client_obd_list_lock(&cli->cl_loi_list_lock);
- rc = snprintf(page, count, "%lu\n", cli->cl_avail_grant);
- client_obd_list_unlock(&cli->cl_loi_list_lock);
- return rc;
+ client_obd_list_lock(&cli->cl_loi_list_lock);
+ rc = seq_printf(m, "%lu\n", cli->cl_avail_grant);
+ client_obd_list_unlock(&cli->cl_loi_list_lock);
+ return rc;
}
-static int osc_wr_cur_grant_bytes(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_cur_grant_bytes_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *obd = data;
+ struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &obd->u.cli;
int rc;
__u64 val;
return rc;
return count;
}
+LPROC_SEQ_FOPS(osc_cur_grant_bytes);
-static int osc_rd_cur_lost_grant_bytes(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_cur_lost_grant_bytes_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
- struct client_obd *cli = &dev->u.cli;
- int rc;
+ struct obd_device *dev = m->private;
+ struct client_obd *cli = &dev->u.cli;
+ int rc;
- client_obd_list_lock(&cli->cl_loi_list_lock);
- rc = snprintf(page, count, "%lu\n", cli->cl_lost_grant);
- client_obd_list_unlock(&cli->cl_loi_list_lock);
- return rc;
+ client_obd_list_lock(&cli->cl_loi_list_lock);
+ rc = seq_printf(m, "%lu\n", cli->cl_lost_grant);
+ client_obd_list_unlock(&cli->cl_loi_list_lock);
+ return rc;
}
+LPROC_SEQ_FOPS_RO(osc_cur_lost_grant_bytes);
-static int osc_rd_grant_shrink_interval(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_grant_shrink_interval_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *obd = data;
+ struct obd_device *obd = m->private;
- if (obd == NULL)
- return 0;
- return snprintf(page, count, "%d\n",
- obd->u.cli.cl_grant_shrink_interval);
+ if (obd == NULL)
+ return 0;
+ return seq_printf(m, "%d\n",
+ obd->u.cli.cl_grant_shrink_interval);
}
-static int osc_wr_grant_shrink_interval(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_grant_shrink_interval_seq_write(struct file *file,
+ const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *obd = data;
- int val, rc;
+ struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ int val, rc;
- if (obd == NULL)
- return 0;
+ if (obd == NULL)
+ return 0;
rc = lprocfs_write_helper(buffer, count, &val);
if (rc)
return count;
}
+LPROC_SEQ_FOPS(osc_grant_shrink_interval);
-static int osc_rd_checksum(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int osc_checksum_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *obd = data;
+ struct obd_device *obd = m->private;
- if (obd == NULL)
- return 0;
+ if (obd == NULL)
+ return 0;
- return snprintf(page, count, "%d\n",
- obd->u.cli.cl_checksum ? 1 : 0);
+ return seq_printf(m, "%d\n",
+ obd->u.cli.cl_checksum ? 1 : 0);
}
-static int osc_wr_checksum(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_checksum_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *obd = data;
- int val, rc;
+ struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ int val, rc;
if (obd == NULL)
return 0;
return count;
}
+LPROC_SEQ_FOPS(osc_checksum);
-static int osc_rd_checksum_type(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int osc_checksum_type_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *obd = data;
- int i, len =0;
- DECLARE_CKSUM_NAME;
+ struct obd_device *obd = m->private;
+ int i;
+ DECLARE_CKSUM_NAME;
if (obd == NULL)
return 0;
- for (i = 0; i < ARRAY_SIZE(cksum_name) && len < count; i++) {
- if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0)
- continue;
- if (obd->u.cli.cl_cksum_type == (1 << i))
- len += snprintf(page + len, count - len, "[%s] ",
- cksum_name[i]);
- else
- len += snprintf(page + len, count - len, "%s ",
- cksum_name[i]);
- }
- if (len < count)
- len += sprintf(page + len, "\n");
- return len;
+ for (i = 0; i < ARRAY_SIZE(cksum_name); i++) {
+ if (((1 << i) & obd->u.cli.cl_supp_cksum_types) == 0)
+ continue;
+ if (obd->u.cli.cl_cksum_type == (1 << i))
+ seq_printf(m, "[%s] ", cksum_name[i]);
+ else
+ seq_printf(m, "%s ", cksum_name[i]);
+ }
+ seq_printf(m, "\n");
+ return 0;
}
-static int osc_wd_checksum_type(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_checksum_type_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *obd = data;
- int i;
- DECLARE_CKSUM_NAME;
- char kernbuf[10];
+ struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ int i;
+ DECLARE_CKSUM_NAME;
+ char kernbuf[10];
if (obd == NULL)
return 0;
}
return -EINVAL;
}
+LPROC_SEQ_FOPS(osc_checksum_type);
-static int osc_rd_resend_count(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int osc_resend_count_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *obd = data;
+ struct obd_device *obd = m->private;
- return snprintf(page, count, "%u\n",
- cfs_atomic_read(&obd->u.cli.cl_resends));
+ return seq_printf(m, "%u\n", cfs_atomic_read(&obd->u.cli.cl_resends));
}
-static int osc_wr_resend_count(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_resend_count_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *obd = data;
- int val, rc;
+ struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ int val, rc;
rc = lprocfs_write_helper(buffer, count, &val);
if (rc)
return count;
}
+LPROC_SEQ_FOPS(osc_resend_count);
-static int osc_rd_contention_seconds(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_contention_seconds_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *obd = data;
- struct osc_device *od = obd2osc_dev(obd);
+ struct obd_device *obd = m->private;
+ struct osc_device *od = obd2osc_dev(obd);
- return snprintf(page, count, "%u\n", od->od_contention_time);
+ return seq_printf(m, "%u\n", od->od_contention_time);
}
-static int osc_wr_contention_seconds(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_contention_seconds_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *obd = data;
- struct osc_device *od = obd2osc_dev(obd);
+ struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
+ struct osc_device *od = obd2osc_dev(obd);
- return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?:
- count;
+ return lprocfs_write_helper(buffer, count, &od->od_contention_time) ?: count;
}
+LPROC_SEQ_FOPS(osc_contention_seconds);
-static int osc_rd_lockless_truncate(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_lockless_truncate_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *obd = data;
- struct osc_device *od = obd2osc_dev(obd);
+ struct obd_device *obd = m->private;
+ struct osc_device *od = obd2osc_dev(obd);
- return snprintf(page, count, "%u\n", od->od_lockless_truncate);
+ return seq_printf(m, "%u\n", od->od_lockless_truncate);
}
-static int osc_wr_lockless_truncate(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t osc_lockless_truncate_seq_write(struct file *file, const char *buffer,
+ size_t count, loff_t *off)
{
- struct obd_device *obd = data;
+ struct obd_device *obd = ((struct seq_file *)file->private_data)->private;
struct osc_device *od = obd2osc_dev(obd);
return lprocfs_write_helper(buffer, count, &od->od_lockless_truncate) ?:
count;
}
+LPROC_SEQ_FOPS(osc_lockless_truncate);
-static int osc_rd_destroys_in_flight(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_destroys_in_flight_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *obd = data;
- return snprintf(page, count, "%u\n",
- cfs_atomic_read(&obd->u.cli.cl_destroy_in_flight));
+ struct obd_device *obd = m->private;
+ return seq_printf(m, "%u\n",
+ cfs_atomic_read(&obd->u.cli.cl_destroy_in_flight));
}
+LPROC_SEQ_FOPS_RO(osc_destroys_in_flight);
-static int lprocfs_osc_wr_max_pages_per_rpc(struct file *file,
- const char *buffer, unsigned long count, void *data)
+static int osc_obd_max_pages_per_rpc_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
+ return lprocfs_obd_max_pages_per_rpc_seq_show(m, m->private);
+}
+
+static ssize_t osc_obd_max_pages_per_rpc_seq_write(struct file *file,
+ const char *buffer,
+ size_t count, loff_t *off)
+{
+ struct obd_device *dev = ((struct seq_file *)file->private_data)->private;
struct client_obd *cli = &dev->u.cli;
struct obd_connect_data *ocd = &cli->cl_import->imp_connect_data;
int chunk_mask, rc;
LPROCFS_CLIMP_EXIT(dev);
return count;
}
+LPROC_SEQ_FOPS(osc_obd_max_pages_per_rpc);
-static int osc_rd_unstable_stats(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int osc_unstable_stats_seq_show(struct seq_file *m, void *v)
{
- struct obd_device *dev = data;
+ struct obd_device *dev = m->private;
struct client_obd *cli = &dev->u.cli;
int pages, mb;
pages = cfs_atomic_read(&cli->cl_unstable_count);
mb = (pages * PAGE_CACHE_SIZE) >> 20;
- return snprintf(page, count,
- "unstable_pages: %8d\n"
+ return seq_printf(m, "unstable_pages: %8d\n"
"unstable_mb: %8d\n",
pages, mb);
}
-
-static struct lprocfs_vars lprocfs_osc_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 },
- { "ost_server_uuid", lprocfs_rd_server_uuid, 0, 0 },
- { "ost_conn_uuid", lprocfs_rd_conn_uuid, 0, 0 },
- { "active", osc_rd_active,
- osc_wr_active, 0 },
- { "max_pages_per_rpc", lprocfs_obd_rd_max_pages_per_rpc,
- lprocfs_osc_wr_max_pages_per_rpc, 0 },
- { "max_rpcs_in_flight", osc_rd_max_rpcs_in_flight,
- osc_wr_max_rpcs_in_flight, 0 },
- { "destroys_in_flight", osc_rd_destroys_in_flight, 0, 0 },
- { "max_dirty_mb", osc_rd_max_dirty_mb, osc_wr_max_dirty_mb, 0 },
- { "osc_cached_mb", osc_rd_cached_mb, osc_wr_cached_mb, 0 },
- { "cur_dirty_bytes", osc_rd_cur_dirty_bytes, 0, 0 },
- { "cur_grant_bytes", osc_rd_cur_grant_bytes,
- osc_wr_cur_grant_bytes, 0 },
- { "cur_lost_grant_bytes", osc_rd_cur_lost_grant_bytes, 0, 0},
- { "grant_shrink_interval", osc_rd_grant_shrink_interval,
- osc_wr_grant_shrink_interval, 0 },
- { "checksums", osc_rd_checksum, osc_wr_checksum, 0 },
- { "checksum_type", osc_rd_checksum_type, osc_wd_checksum_type, 0 },
- { "resend_count", osc_rd_resend_count, osc_wr_resend_count, 0},
- { "timeouts", lprocfs_rd_timeouts, 0, 0 },
- { "contention_seconds", osc_rd_contention_seconds,
- osc_wr_contention_seconds, 0 },
- { "lockless_truncate", osc_rd_lockless_truncate,
- osc_wr_lockless_truncate, 0 },
- { "import", lprocfs_rd_import, lprocfs_wr_import, 0 },
- { "state", lprocfs_rd_state, 0, 0 },
- { "pinger_recov", lprocfs_rd_pinger_recov,
- lprocfs_wr_pinger_recov, 0, 0 },
- { "unstable_stats", osc_rd_unstable_stats, 0, 0},
-
- { 0 }
-};
-
-static struct lprocfs_vars lprocfs_osc_module_vars[] = {
- { "num_refs", lprocfs_rd_numrefs, 0, 0 },
- { 0 }
+LPROC_SEQ_FOPS_RO(osc_unstable_stats);
+
+LPROC_SEQ_FOPS_RO_TYPE(osc, uuid);
+LPROC_SEQ_FOPS_RO_TYPE(osc, connect_flags);
+LPROC_SEQ_FOPS_RO_TYPE(osc, blksize);
+LPROC_SEQ_FOPS_RO_TYPE(osc, kbytestotal);
+LPROC_SEQ_FOPS_RO_TYPE(osc, kbytesfree);
+LPROC_SEQ_FOPS_RO_TYPE(osc, kbytesavail);
+LPROC_SEQ_FOPS_RO_TYPE(osc, filestotal);
+LPROC_SEQ_FOPS_RO_TYPE(osc, filesfree);
+LPROC_SEQ_FOPS_RO_TYPE(osc, server_uuid);
+LPROC_SEQ_FOPS_RO_TYPE(osc, conn_uuid);
+LPROC_SEQ_FOPS_RO_TYPE(osc, timeouts);
+LPROC_SEQ_FOPS_RO_TYPE(osc, state);
+
+LPROC_SEQ_FOPS_WO_TYPE(osc, ping);
+
+LPROC_SEQ_FOPS_RW_TYPE(osc, import);
+LPROC_SEQ_FOPS_RW_TYPE(osc, pinger_recov);
+
+struct lprocfs_seq_vars lprocfs_osc_obd_vars[] = {
+ { "uuid", &osc_uuid_fops },
+ { "ping", &osc_ping_fops, 0, 0222 },
+ { "connect_flags", &osc_connect_flags_fops },
+ { "blocksize", &osc_blksize_fops },
+ { "kbytestotal", &osc_kbytestotal_fops },
+ { "kbytesfree", &osc_kbytesfree_fops },
+ { "kbytesavail", &osc_kbytesavail_fops },
+ { "filestotal", &osc_filestotal_fops },
+ { "filesfree", &osc_filesfree_fops },
+ { "ost_server_uuid", &osc_server_uuid_fops },
+ { "ost_conn_uuid", &osc_conn_uuid_fops },
+ { "active", &osc_active_fops },
+ { "max_pages_per_rpc", &osc_obd_max_pages_per_rpc_fops },
+ { "max_rpcs_in_flight", &osc_max_rpcs_in_flight_fops },
+ { "destroys_in_flight", &osc_destroys_in_flight_fops },
+ { "max_dirty_mb", &osc_max_dirty_mb_fops },
+ { "osc_cached_mb", &osc_cached_mb_fops },
+ { "cur_dirty_bytes", &osc_cur_dirty_bytes_fops },
+ { "cur_grant_bytes", &osc_cur_grant_bytes_fops },
+ { "cur_lost_grant_bytes", &osc_cur_lost_grant_bytes_fops },
+ { "grant_shrink_interval", &osc_grant_shrink_interval_fops },
+ { "checksums", &osc_checksum_fops },
+ { "checksum_type", &osc_checksum_type_fops },
+ { "resend_count", &osc_resend_count_fops },
+ { "timeouts", &osc_timeouts_fops },
+ { "contention_seconds", &osc_contention_seconds_fops },
+ { "lockless_truncate", &osc_lockless_truncate_fops },
+ { "import", &osc_import_fops },
+ { "state", &osc_state_fops },
+ { "pinger_recov", &osc_pinger_recov_fops },
+ { "unstable_stats", &osc_unstable_stats_fops },
+ { 0 }
};
#define pct(a,b) (b ? a * 100 / b : 0)
return len;
}
-
LPROC_SEQ_FOPS(osc_rpc_stats);
static int osc_stats_seq_show(struct seq_file *seq, void *v)
return rc;
}
-
-void lprocfs_osc_init_vars(struct lprocfs_static_vars *lvars)
-{
- lvars->module_vars = lprocfs_osc_module_vars;
- lvars->obd_vars = lprocfs_osc_obd_vars;
-}
#endif /* LPROCFS */
git://git.whamcloud.com / fs / lustre-release.git / commitdiff