int lprocfs_evict_client_open(struct inode *inode, struct file *f)
{
- struct obd_device *obd = PDE_DATA(f->f_path.dentry->d_inode);
+ struct obd_device *obd = PDE_DATA(file_inode(f));
atomic_inc(&obd->obd_evict_inprogress);
return 0;
int lprocfs_evict_client_release(struct inode *inode, struct file *f)
{
- struct obd_device *obd = PDE_DATA(f->f_path.dentry->d_inode);
+ struct obd_device *obd = PDE_DATA(file_inode(f));
atomic_dec(&obd->obd_evict_inprogress);
wake_up(&obd->obd_evict_inprogress_waitq);
struct obd_device *obd = data;
LASSERT(obd != NULL);
- return seq_printf(m, "%u\n", obd->obd_num_exports);
+ seq_printf(m, "%u\n", obd->obd_num_exports);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_num_exports_seq_show);
struct tg_export_data *ted = &exp->exp_target_data;
seq_printf(m, "reply_cnt: %d\n"
- "reply_max: %d\n"
- "reply_released_by_xid: %d\n"
- "reply_released_by_tag: %d\n\n",
+ "reply_max: %d\n"
+ "reply_released_by_xid: %d\n"
+ "reply_released_by_tag: %d\n\n",
ted->ted_reply_cnt,
ted->ted_reply_max,
ted->ted_release_xid,
int lprocfs_nid_stats_clear_seq_show(struct seq_file *m, void *data)
{
- return seq_printf(m, "%s\n", "Write into this file to clear all nid "
- "stats and stale nid entries");
+ seq_puts(m, "Write into this file to clear all nid stats and stale nid entries\n");
+ return 0;
}
EXPORT_SYMBOL(lprocfs_nid_stats_clear_seq_show);
int lprocfs_hash_seq_show(struct seq_file *m, void *data)
{
struct obd_device *obd = m->private;
- int c = 0;
if (obd == NULL)
return 0;
- c += cfs_hash_debug_header(m);
- c += cfs_hash_debug_str(obd->obd_uuid_hash, m);
- c += cfs_hash_debug_str(obd->obd_nid_hash, m);
- c += cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
- return c;
+ cfs_hash_debug_header(m);
+ cfs_hash_debug_str(obd->obd_uuid_hash, m);
+ cfs_hash_debug_str(obd->obd_nid_hash, m);
+ cfs_hash_debug_str(obd->obd_nid_stats_hash, m);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_hash_seq_show);
seq_printf(m, "COMPLETE\n");
seq_printf(m, "recovery_start: %lu\n", obd->obd_recovery_start);
seq_printf(m, "recovery_duration: %lu\n",
- obd->obd_recovery_end - obd->obd_recovery_start);
+ obd->obd_recovery_end ?
+ obd->obd_recovery_end - obd->obd_recovery_start :
+ cfs_time_current_sec() - obd->obd_recovery_start);
/* Number of clients that have completed recovery */
seq_printf(m, "completed_clients: %d/%d\n",
obd->obd_max_recoverable_clients -
obd->obd_max_recoverable_clients);
seq_printf(m, "replayed_requests: %d\n",
obd->obd_replayed_requests);
- seq_printf(m, "last_transno: "LPD64"\n",
+ seq_printf(m, "last_transno: %lld\n",
obd->obd_next_recovery_transno - 1);
seq_printf(m, "VBR: %s\n", obd->obd_version_recov ?
"ENABLED" : "DISABLED");
seq_printf(m, "replayed_requests: %d\n", obd->obd_replayed_requests);
seq_printf(m, "queued_requests: %d\n",
obd->obd_requests_queued_for_recovery);
- seq_printf(m, "next_transno: "LPD64"\n",
+ seq_printf(m, "next_transno: %lld\n",
obd->obd_next_recovery_transno);
out:
return 0;
struct obd_device *obd = m->private;
LASSERT(obd != NULL);
- return seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
+ seq_printf(m, "%d\n", obd->obd_recovery_ir_factor);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_ir_factor_seq_show);
{
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(obd != NULL);
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
if (rc)
return rc;
struct obd_device *obd = m->private;
LASSERT(obd != NULL);
- return seq_printf(m, "%d\n", obd->obd_recovery_timeout);
+ seq_printf(m, "%d\n", obd->obd_recovery_timeout);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_recovery_time_soft_seq_show);
{
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(obd != NULL);
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
if (rc)
return rc;
+ if (val < 0 || val > INT_MAX)
+ return -ERANGE;
obd->obd_recovery_timeout = val;
return count;
struct obd_device *obd = m->private;
LASSERT(obd != NULL);
- return seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
+ seq_printf(m, "%u\n", obd->obd_recovery_time_hard);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_recovery_time_hard_seq_show);
{
struct seq_file *m = file->private_data;
struct obd_device *obd = m->private;
- int val, rc;
+ int rc;
+ __s64 val;
LASSERT(obd != NULL);
- rc = lprocfs_write_helper(buffer, count, &val);
+ rc = lprocfs_str_to_s64(buffer, count, &val);
if (rc)
return rc;
+ if (val < 0 || val > INT_MAX)
+ return -ERANGE;
obd->obd_recovery_time_hard = val;
return count;
LASSERT(obd != NULL);
LASSERT(target->obt_magic == OBT_MAGIC);
- return seq_printf(m, "%u\n", obd->u.obt.obt_instance);
+ seq_printf(m, "%u\n", obd->u.obt.obt_instance);
+ return 0;
}
EXPORT_SYMBOL(lprocfs_target_instance_seq_show);