* GPL HEADER END
*/
/*
- * Copyright (c) 2012, 2013, Intel Corporation.
+ * Copyright (c) 2012, 2014, Intel Corporation.
* Use is subject to license terms.
*
* Author: Niu Yawei <niu@whamcloud.com>
#include <lprocfs_status.h>
#include <lustre/lustre_idl.h>
-#if defined(LPROCFS)
+#ifdef CONFIG_PROC_FS
/*
* JobID formats & JobID environment variable names for supported
struct hlist_node js_hash;
struct list_head js_list;
atomic_t js_refcount;
- char js_jobid[JOBSTATS_JOBID_SIZE];
+ char js_jobid[LUSTRE_JOBID_SIZE];
time_t js_timestamp; /* seconds */
struct lprocfs_stats *js_stats;
struct obd_job_stats *js_jobstats;
jobs->ojs_cntr_init_fn(job->js_stats);
- memcpy(job->js_jobid, jobid, JOBSTATS_JOBID_SIZE);
+ memcpy(job->js_jobid, jobid, LUSTRE_JOBID_SIZE);
job->js_timestamp = cfs_time_current_sec();
job->js_jobstats = jobs;
INIT_HLIST_NODE(&job->js_hash);
if (!jobid || !strlen(jobid))
RETURN(-EINVAL);
- if (strlen(jobid) >= JOBSTATS_JOBID_SIZE) {
+ if (strlen(jobid) >= LUSTRE_JOBID_SIZE) {
CERROR("Invalid jobid size (%lu), expect(%d)\n",
- (unsigned long)strlen(jobid) + 1, JOBSTATS_JOBID_SIZE);
+ (unsigned long)strlen(jobid) + 1, LUSTRE_JOBID_SIZE);
RETURN(-EINVAL);
}
return 0;
}
-struct seq_operations lprocfs_jobstats_seq_sops = {
+static const struct seq_operations lprocfs_jobstats_seq_sops = {
start: lprocfs_jobstats_seq_start,
stop: lprocfs_jobstats_seq_stop,
next: lprocfs_jobstats_seq_next,
struct seq_file *seq;
int rc;
- if (LPROCFS_ENTRY_CHECK(PDE(inode)))
- return -ENOENT;
+ rc = LPROCFS_ENTRY_CHECK(inode);
+ if (rc < 0)
+ return rc;
rc = seq_open(file, &lprocfs_jobstats_seq_sops);
if (rc)
{
struct seq_file *seq = file->private_data;
struct obd_job_stats *stats = seq->private;
- char jobid[JOBSTATS_JOBID_SIZE];
+ char jobid[LUSTRE_JOBID_SIZE];
int all = 0;
struct job_stat *job;
- if (len == 0 || len >= JOBSTATS_JOBID_SIZE)
+ if (len == 0 || len >= LUSTRE_JOBID_SIZE)
return -EINVAL;
if (copy_from_user(jobid, buf, len))
return len;
}
-struct file_operations lprocfs_jobstats_seq_fops = {
+static const struct file_operations lprocfs_jobstats_seq_fops = {
.owner = THIS_MODULE,
.open = lprocfs_jobstats_seq_open,
.read = seq_read,
stats->ojs_cleanup_interval = 600; /* 10 mins by default */
stats->ojs_last_cleanup = cfs_time_current_sec();
- LPROCFS_WRITE_ENTRY();
- entry = proc_create_data("job_stats", 0644, obd->obd_proc_entry,
- &lprocfs_jobstats_seq_fops, stats);
- LPROCFS_WRITE_EXIT();
- if (entry == NULL) {
+ entry = lprocfs_add_simple(obd->obd_proc_entry, "job_stats", stats,
+ &lprocfs_jobstats_seq_fops);
+ if (IS_ERR(entry)) {
lprocfs_job_stats_fini(obd);
RETURN(-ENOMEM);
}
}
EXPORT_SYMBOL(lprocfs_job_stats_init);
-#ifndef HAVE_ONLY_PROCFS_SEQ
-int lprocfs_rd_job_interval(char *page, char **start, off_t off,
- int count, int *eof, void *data)
-{
- struct obd_device *obd = (struct obd_device *)data;
- struct obd_job_stats *stats;
-
- LASSERT(obd != NULL);
- stats = &obd->u.obt.obt_jobstats;
- *eof = 1;
- return snprintf(page, count, "%d\n", stats->ojs_cleanup_interval);
-}
-EXPORT_SYMBOL(lprocfs_rd_job_interval);
-
-int lprocfs_wr_job_interval(struct file *file, const char __user *buffer,
- unsigned long count, void *data)
-{
- struct obd_device *obd = (struct obd_device *)data;
- struct obd_job_stats *stats;
- int val, rc;
-
- LASSERT(obd != NULL);
- stats = &obd->u.obt.obt_jobstats;
-
- rc = lprocfs_write_helper(buffer, count, &val);
- if (rc)
- return rc;
-
- stats->ojs_cleanup_interval = val;
- lprocfs_job_cleanup(stats, true);
-
- return count;
-
-}
-EXPORT_SYMBOL(lprocfs_wr_job_interval);
-#endif
int lprocfs_job_interval_seq_show(struct seq_file *m, void *data)
{
struct obd_device *obd = m->private;
return count;
}
EXPORT_SYMBOL(lprocfs_job_interval_seq_write);
-#endif /* LPROCFS*/
+#endif /* CONFIG_PROC_FS*/