proc: switch /proc/scsi/device_info to seq_file interface
PATCH 11/12 proc: switch /proc/scsi/device_info to seq_file interface
Note 1: 0644 should be used, but root bypasses permissions, so writing
to /proc/scsi/device_info still works.
Note 2: looks like scsi_dev_info_list is unprotected
Note 3: probably make proc whine about "unwriteable but with ->write hook"
entries. Probably.
Signed-off-by Alexey Dobriyan <[email protected]>
---
drivers/scsi/scsi_devinfo.c | 77 +++++++++++++++++++++++++------------------- 1 file changed, 44 insertions(+), 33 deletions(-)
drivers/scsi/scsi_devinfo.c +44 -33
@@ -449,37 +449,40 @@ int scsi_get_device_flags(struct scsi_device *sdev, }#ifdef CONFIG_SCSI_PROC_FS -/* -* proc_scsi_dev_info_read: dump the scsi_dev_info_list via -* /proc/scsi/device_info -*/ -static int proc_scsi_devinfo_read (char *buffer,char **start, -off_t offset,int length) +static int devinfo_seq_show (struct seq_file *m,void *v) { -struct scsi_dev_info_list *devinfo; -int size, len =0 ; -off_t begin =0 ; -off_t pos =0 ; +struct scsi_dev_info_list *devinfo = + list_entry(v, struct scsi_dev_info_list, dev_info_list); -list_for_each_entry (devinfo, &scsi_dev_info_list, dev_info_list) { - size =sprintf (buffer + len,"'%.8s' '%.16s' 0x%x\n" , +seq_printf (m,"'%.8s' '%.16s' 0x%x\n" , devinfo->vendor, devinfo->model, devinfo->flags); - len += size; - pos = begin + len; -if (pos < offset) { - len =0 ; - begin = pos; - } -if (pos > offset + length) - goto stop_output; - } +return 0 ; +} + +static void *devinfo_seq_start (struct seq_file *m,loff_t *pos) +{ +return seq_list_start (&scsi_dev_info_list, *pos); +} -stop_output: - *start = buffer + (offset - begin);/* Start of wanted data */ - len -= (offset - begin);/* Start slop */ -if (len > length) - len = length;/* Ending slop */ -return (len); +static void *devinfo_seq_next (struct seq_file *m,void *v,loff_t *pos) +{ +return seq_list_next (v, &scsi_dev_info_list, pos); +} + +static void devinfo_seq_stop (struct seq_file *m,void *v) +{ +} + +static const struct seq_operations scsi_devinfo_seq_ops = { + .start = devinfo_seq_start, + .next = devinfo_seq_next, + .stop = devinfo_seq_stop, + .show = devinfo_seq_show, +}; + +static int proc_scsi_devinfo_open (struct inode *inode,struct file *file) +{ +return seq_open (file, &scsi_devinfo_seq_ops); }/*
@@ -489,11 +492,12 @@ stop_output:* integer value of flag to the scsi device info list. * To use, echo "vendor:model:flag" > /proc/scsi/device_info */ -static int proc_scsi_devinfo_write (struct file *file,const char __user *buf, -unsigned long length,void *data) +static ssize_t proc_scsi_devinfo_write (struct file *file, +const char __user *buf, +size_t length,loff_t *ppos) {char *buffer; -int err = length; +ssize_t err = length;if (!buf || length>PAGE_SIZE )return -EINVAL ;
@@ -517,6 +521,15 @@ out:free_page ((unsigned long )buffer); return err; } + +static const struct file_operations scsi_devinfo_proc_fops = { + .owner =THIS_MODULE , + .open = proc_scsi_devinfo_open, + .read = seq_read, + .write = proc_scsi_devinfo_write, + .llseek = seq_lseek, + .release = seq_release, +};#endif /* CONFIG_SCSI_PROC_FS */ module_param_string (dev_flags, scsi_dev_flags,sizeof (scsi_dev_flags),0 );
@@ -577,15 +590,13 @@ int __init scsi_init_devinfo(void) }#ifdef CONFIG_SCSI_PROC_FS - p =create_proc_entry ("scsi/device_info" ,0 ,NULL ); + p =proc_create ("scsi/device_info" ,0 ,NULL , &scsi_devinfo_proc_fops);if (!p) { error = -ENOMEM ; goto out; } p->owner =THIS_MODULE ; - p->get_info = proc_scsi_devinfo_read; - p->write_proc = proc_scsi_devinfo_write;#endif /* CONFIG_SCSI_PROC_FS */ out:
Signature · 1 line
1.5.4.3