seq_file: convert drivers/s390/
Subsystems (3)
PATCH 1/1 seq_file: convert drivers/s390/
Signed-off-by Alexey Dobriyan <[email protected]>
---
drivers/s390/block/dasd_proc.c | 109 ++++++++++++++---------------- drivers/s390/crypto/zcrypt_api.c | 139 +++++++++++++++++---------------------- 2 files changed, 114 insertions(+), 134 deletions(-)
drivers/s390/block/dasd_proc.c +50 -59
@@ -167,51 +167,32 @@ static const struct file_operations dasd_devices_file_ops = { .release = seq_release, }; -static int -dasd_calc_metrics (char *page,char **start,off_t off, -int count,int *eof,int len) -{ - len = (len > off) ? len - off :0 ; -if (len > count) - len = count; -if (len < count) - *eof =1 ; - *start = page + off; -return len; -} -#ifdef CONFIG_DASD_PROFILE -static char * -dasd_statistics_array (char *str,unsigned int *array,int factor) +static void dasd_statistics_array (struct seq_file *m,unsigned int *array,int factor) {int i;for (i =0 ; i <32 ; i++) { - str +=sprintf (str,"%7d " , array[i] / factor); +seq_printf (m,"%7d " , array[i] / factor);if (i ==15 ) - str +=sprintf (str,"\n" ); +seq_putc (m,'\n' ); } - str +=sprintf (str,"\n" ); -return str; +seq_putc (m,'\n' ); }#endif /* CONFIG_DASD_PROFILE */ -static int -dasd_statistics_read (char *page,char **start,off_t off, -int count,int *eof,void *data) +static int dasd_stats_proc_show (struct seq_file *m,void *v) { -unsigned long len;#ifdef CONFIG_DASD_PROFILE struct dasd_profile_info_t *prof; -char *str;int factor;/* check for active profiling */ if (dasd_profile_level ==DASD_PROFILE_OFF ) { - len =sprintf (page,"Statistics are off - they might be " +seq_printf (m,"Statistics are off - they might be " "switched on using 'echo set on > " "/proc/dasd/statistics'\n" ); -return dasd_calc_metrics (page, start, off, count, eof, len); +return 0 ; } prof = &dasd_global_profile;
@@ -219,47 +200,49 @@ dasd_statistics_read(char *page, char **start, off_t off,for (factor =1 ; (prof->dasd_io_reqs / factor) >9999999 ; factor *=10 ); - str = page; - str +=sprintf (str,"%d dasd I/O requests\n" , prof->dasd_io_reqs); - str +=sprintf (str,"with %u sectors(512B each)\n" , +seq_printf (m,"%d dasd I/O requests\n" , prof->dasd_io_reqs); +seq_printf (m,"with %u sectors(512B each)\n" , prof->dasd_io_sects); - str +=sprintf (str,"Scale Factor is %d\n" , factor); - str +=sprintf (str, +seq_printf (m,"Scale Factor is %d\n" , factor); +seq_printf (m," __<4 ___8 __16 __32 __64 _128 " " _256 _512 __1k __2k __4k __8k " " _16k _32k _64k 128k\n" ); - str +=sprintf (str, +seq_printf (m," _256 _512 __1M __2M __4M __8M " " _16M _32M _64M 128M 256M 512M " " __1G __2G __4G " " _>4G\n" ); - str +=sprintf (str,"Histogram of sizes (512B secs)\n" ); - str =dasd_statistics_array (str, prof->dasd_io_secs, factor); - str +=sprintf (str,"Histogram of I/O times (microseconds)\n" ); - str =dasd_statistics_array (str, prof->dasd_io_times, factor); - str +=sprintf (str,"Histogram of I/O times per sector\n" ); - str =dasd_statistics_array (str, prof->dasd_io_timps, factor); - str +=sprintf (str,"Histogram of I/O time till ssch\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time1, factor); - str +=sprintf (str,"Histogram of I/O time between ssch and irq\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time2, factor); - str +=sprintf (str,"Histogram of I/O time between ssch " +seq_printf (m,"Histogram of sizes (512B secs)\n" ); +dasd_statistics_array (m, prof->dasd_io_secs, factor); +seq_printf (m,"Histogram of I/O times (microseconds)\n" ); +dasd_statistics_array (m, prof->dasd_io_times, factor); +seq_printf (m,"Histogram of I/O times per sector\n" ); +dasd_statistics_array (m, prof->dasd_io_timps, factor); +seq_printf (m,"Histogram of I/O time till ssch\n" ); +dasd_statistics_array (m, prof->dasd_io_time1, factor); +seq_printf (m,"Histogram of I/O time between ssch and irq\n" ); +dasd_statistics_array (m, prof->dasd_io_time2, factor); +seq_printf (m,"Histogram of I/O time between ssch " "and irq per sector\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time2ps, factor); - str +=sprintf (str,"Histogram of I/O time between irq and end\n" ); - str =dasd_statistics_array (str, prof->dasd_io_time3, factor); - str +=sprintf (str,"# of req in chanq at enqueuing (1..32) \n" ); - str =dasd_statistics_array (str, prof->dasd_io_nr_req, factor); - len = str - page; +dasd_statistics_array (m, prof->dasd_io_time2ps, factor); +seq_printf (m,"Histogram of I/O time between irq and end\n" ); +dasd_statistics_array (m, prof->dasd_io_time3, factor); +seq_printf (m,"# of req in chanq at enqueuing (1..32) \n" ); +dasd_statistics_array (m, prof->dasd_io_nr_req, factor);#else - len =sprintf (page,"Statistics are not activated in this kernel\n" ); +seq_printf (m,"Statistics are not activated in this kernel\n" );#endif -return dasd_calc_metrics (page, start, off, count, eof, len); +return 0 ; } -static int -dasd_statistics_write (struct file *file,const char __user *user_buf, -unsigned long user_len,void *data) +static int dasd_stats_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, dasd_stats_proc_show,NULL ); +} + +static ssize_t dasd_stats_proc_write (struct file *file, +const char __user *user_buf,size_t user_len,loff_t *pos) {#ifdef CONFIG_DASD_PROFILE char *buffer, *str;
@@ -310,6 +293,15 @@ out_error:#endif /* CONFIG_DASD_PROFILE */ } +static const struct file_operations dasd_stats_proc_fops = { + .owner =THIS_MODULE , + .open = dasd_stats_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, + .write = dasd_stats_proc_write, +}; +/* * Create dasd proc-fs entries. * In case creation failed, cleanup and return -ENOENT.
@@ -326,13 +318,12 @@ dasd_proc_init(void) &dasd_devices_file_ops);if (!dasd_devices_entry) goto out_nodevices; - dasd_statistics_entry =create_proc_entry ("statistics" , -S_IFREG |S_IRUGO |S_IWUSR , - dasd_proc_root_entry); + dasd_statistics_entry =proc_create ("statistics" , +S_IFREG |S_IRUGO |S_IWUSR , + dasd_proc_root_entry, + &dasd_stats_proc_fops);if (!dasd_statistics_entry) goto out_nostatistics; - dasd_statistics_entry->read_proc = dasd_statistics_read; - dasd_statistics_entry->write_proc = dasd_statistics_write;return 0 ; out_nostatistics:
drivers/s390/crypto/zcrypt_api.c +64 -75
223 lines not on this page · raw message
Changes in linux-next killed this patch.