malhuda/msm-4.14
1
0
Fork 0
mirror of https://github.com/rd-stuffs/msm-4.14.git synced 2025-02-20 11:45:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: lustre: Use kstrtouint_from_user in ldlm_rw_uint

Browse Source 
Clean up the helper functions used to implement "dump_granted_max" in
debugfs.

Replace the lprocfs_rd_uint() and lprocfs_wr_uint() generic callbacks
with a simpler, more direct implementation of ldlm_rw_uint_fops.

There's a slight change in lustre debugfs write semantics: Using kstrtox
causes EINVAL when the written number is followed by other (garbage)
characters, whereas previously the garbage would be ignored and such a
write would succeed.

Signed-off-by: Mathias Rav <mathiasrav@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Mathias Rav 2017-05-18 22:49:21 -04:00 committed by Greg Kroah-Hartman
parent 93e7ea8ca0
commit 8b23093269
2 changed files with 19 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
View File

@ -78,7 +78,25 @@ lprocfs_wr_dump_ns(struct file *file, const char __user *buffer,
LPROC_SEQ_FOPS_WR_ONLY(ldlm, dump_ns);
LPROC_SEQ_FOPS_RW_TYPE(ldlm_rw, uint);
static int ldlm_rw_uint_seq_show(struct seq_file *m, void *v)
{
seq_printf(m, "%u\n", *(unsigned int *)m->private);
return 0;
}
static ssize_t
ldlm_rw_uint_seq_write(struct file *file, const char __user *buffer,
size_t count, loff_t *off)
{
struct seq_file *seq = file->private_data;
if (count == 0)
return 0;
return kstrtouint_from_user(buffer, count, 0,
(unsigned int *)seq->private);
}
LPROC_SEQ_FOPS(ldlm_rw_uint);
static struct lprocfs_vars ldlm_debugfs_list[] = {
{ "dump_namespaces", &ldlm_dump_ns_fops, NULL, 0222 },

34
drivers/staging/lustre/lustre/obdclass/lprocfs_status.c
View File

@ -389,40 +389,6 @@ out:
EXPORT_SYMBOL_GPL(ldebugfs_register);
/* Generic callbacks */
int lprocfs_rd_uint(struct seq_file *m, void *data)
{
seq_printf(m, "%u\n", *(unsigned int *)data);
return 0;
}
EXPORT_SYMBOL(lprocfs_rd_uint);
int lprocfs_wr_uint(struct file *file, const char __user *buffer,
unsigned long count, void *data)
{
unsigned *p = data;
char dummy[MAX_STRING_SIZE + 1], *end;
unsigned long tmp;
if (count >= sizeof(dummy))
return -EINVAL;
if (count == 0)
return 0;
if (copy_from_user(dummy, buffer, count))
return -EFAULT;
dummy[count] = '\0';
tmp = simple_strtoul(dummy, &end, 0);
if (dummy == end)
return -EINVAL;
*p = (unsigned int)tmp;
return count;
}
EXPORT_SYMBOL(lprocfs_wr_uint);
static ssize_t uuid_show(struct kobject *kobj, struct attribute *attr,
char *buf)
{