#endif
#ifdef LPROCFS
-int obd_proc_read_version(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int obd_proc_version_seq_show(struct seq_file *m, void *v)
{
- *eof = 1;
- return snprintf(page, count, "lustre: %s\nkernel: %s\nbuild: %s\n",
- LUSTRE_VERSION_STRING, "patchless_client",
- BUILD_VERSION);
+ return seq_printf(m, "lustre: %s\nkernel: %s\nbuild: %s\n",
+ LUSTRE_VERSION_STRING, "patchless_client",
+ BUILD_VERSION);
}
+LPROC_SEQ_FOPS_RO(obd_proc_version);
-int obd_proc_read_pinger(char *page, char **start, off_t off, int count,
- int *eof, void *data)
+static int obd_proc_pinger_seq_show(struct seq_file *m, void *v)
{
- *eof = 1;
- return snprintf(page, count, "%s\n",
+ return seq_printf(m, "%s\n",
#ifdef ENABLE_PINGER
- "on"
+ "on"
#else
- "off"
+ "off"
#endif
- );
+ );
}
+LPROC_SEQ_FOPS_RO(obd_proc_pinger);
/**
* Check all obd devices health
*
- * \param page
- * \param start
- * \param off
- * \param count
- * \param eof
- * \param data
- * proc read function parameters, please refer to kernel
- * code fs/proc/generic.c proc_file_read()
+ * \param seq_file
* \param data [in] unused
*
- * \retval number of characters printed
+ * \retval number of characters printed if healthy
*/
-static int obd_proc_read_health(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int obd_proc_health_seq_show(struct seq_file *m, void *data)
{
- int rc = 0, i;
- *eof = 1;
+ bool healthy = true;
+ int i;
- if (libcfs_catastrophe)
- rc += snprintf(page + rc, count - rc, "LBUG\n");
+ if (libcfs_catastrophe)
+ seq_printf(m, "LBUG\n");
read_lock(&obd_dev_lock);
- for (i = 0; i < class_devno_max(); i++) {
- struct obd_device *obd;
+ for (i = 0; i < class_devno_max(); i++) {
+ struct obd_device *obd;
- obd = class_num2obd(i);
- if (obd == NULL || !obd->obd_attached || !obd->obd_set_up)
- continue;
+ obd = class_num2obd(i);
+ if (obd == NULL || !obd->obd_attached || !obd->obd_set_up)
+ continue;
- LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
- if (obd->obd_stopping)
- continue;
+ LASSERT(obd->obd_magic == OBD_DEVICE_MAGIC);
+ if (obd->obd_stopping)
+ continue;
- class_incref(obd, __FUNCTION__, cfs_current());
+ class_incref(obd, __FUNCTION__, current);
read_unlock(&obd_dev_lock);
- if (obd_health_check(NULL, obd)) {
- rc += snprintf(page + rc, count - rc,
- "device %s reported unhealthy\n",
- obd->obd_name);
- }
- class_decref(obd, __FUNCTION__, cfs_current());
+ if (obd_health_check(NULL, obd)) {
+ seq_printf(m, "device %s reported unhealthy\n",
+ obd->obd_name);
+ healthy = false;
+ }
+ class_decref(obd, __FUNCTION__, current);
read_lock(&obd_dev_lock);
- }
+ }
read_unlock(&obd_dev_lock);
- if (rc == 0)
- return snprintf(page, count, "healthy\n");
+ if (healthy)
+ return seq_printf(m, "healthy\n");
- rc += snprintf(page + rc, count - rc, "NOT HEALTHY\n");
- return rc;
+ seq_printf(m, "NOT HEALTHY\n");
+ return 0;
}
+LPROC_SEQ_FOPS_RO(obd_proc_health);
-static int obd_proc_rd_jobid_var(char *page, char **start, off_t off,
- int count, int *eof, void *data)
+static int obd_proc_jobid_var_seq_show(struct seq_file *m, void *v)
{
- return snprintf(page, count, "%s\n", obd_jobid_var);
+ return seq_printf(m, "%s\n", obd_jobid_var);
}
-static int obd_proc_wr_jobid_var(struct file *file, const char *buffer,
- unsigned long count, void *data)
+static ssize_t
+obd_proc_jobid_var_seq_write(struct file *file, const char __user *buffer,
+ size_t count, loff_t *off)
{
if (!count || count > JOBSTATS_JOBID_VAR_MAX_LEN)
return -EINVAL;
memset(obd_jobid_var, 0, JOBSTATS_JOBID_VAR_MAX_LEN + 1);
+
+ /* This might leave the var invalid on error, which is probably fine.*/
+ if (copy_from_user(obd_jobid_var, buffer, count))
+ return -EFAULT;
+
/* Trim the trailing '\n' if any */
- memcpy(obd_jobid_var, buffer, count - (buffer[count - 1] == '\n'));
+ if (obd_jobid_var[count - 1] == '\n')
+ obd_jobid_var[count - 1] = 0;
+
return count;
}
+LPROC_SEQ_FOPS(obd_proc_jobid_var);
/* Root for /proc/fs/lustre */
struct proc_dir_entry *proc_lustre_root = NULL;
EXPORT_SYMBOL(proc_lustre_root);
-struct lprocfs_vars lprocfs_base[] = {
- { "version", obd_proc_read_version, NULL, NULL },
- { "pinger", obd_proc_read_pinger, NULL, NULL },
- { "health_check", obd_proc_read_health, NULL, NULL },
- { "jobid_var", obd_proc_rd_jobid_var,
- obd_proc_wr_jobid_var, NULL },
+struct lprocfs_seq_vars lprocfs_base[] = {
+ { .name = "version",
+ .fops = &obd_proc_version_fops },
+ { .name = "pinger",
+ .fops = &obd_proc_pinger_fops },
+ { .name = "health_check",
+ .fops = &obd_proc_health_fops },
+ { .name = "jobid_var",
+ .fops = &obd_proc_jobid_var_fops},
{ 0 }
};
#else
return seq_printf(p, "%3d %s %s %s %s %d\n",
(int)index, status, obd->obd_type->typ_name,
obd->obd_name, obd->obd_uuid.uuid,
- cfs_atomic_read(&obd->obd_refcount));
+ atomic_read(&obd->obd_refcount));
}
struct seq_operations obd_device_list_sops = {
static int obd_device_list_open(struct inode *inode, struct file *file)
{
- struct proc_dir_entry *dp = PDE(inode);
- struct seq_file *seq;
- int rc = seq_open(file, &obd_device_list_sops);
-
- if (rc)
- return rc;
+ struct seq_file *seq;
+ int rc = seq_open(file, &obd_device_list_sops);
- seq = file->private_data;
- seq->private = dp->data;
+ if (rc)
+ return rc;
- return 0;
+ seq = file->private_data;
+ seq->private = PDE_DATA(inode);
+ return 0;
}
struct file_operations obd_device_list_fops = {
int class_procfs_init(void)
{
#ifdef __KERNEL__
- int rc;
- ENTRY;
+ int rc;
+ ENTRY;
- obd_sysctl_init();
- proc_lustre_root = lprocfs_register("fs/lustre", NULL,
- lprocfs_base, NULL);
- rc = lprocfs_seq_create(proc_lustre_root, "devices", 0444,
- &obd_device_list_fops, NULL);
- if (rc)
- CERROR("error adding /proc/fs/lustre/devices file\n");
+ obd_sysctl_init();
+ proc_lustre_root = lprocfs_seq_register("fs/lustre", NULL,
+ lprocfs_base, NULL);
+ rc = lprocfs_seq_create(proc_lustre_root, "devices", 0444,
+ &obd_device_list_fops, NULL);
+ if (rc)
+ CERROR("error adding /proc/fs/lustre/devices file\n");
#else
- ENTRY;
+ ENTRY;
#endif
- RETURN(0);
+ RETURN(0);
}
#ifdef __KERNEL__
git://git.whamcloud.com / fs / lustre-release.git / blobdiff