uml: convert to seq_file/proc_fops
PATCH 1/1 uml: convert to seq_file/proc_fops
Signed-off-by Alexey Dobriyan <[email protected]>
---
arch/um/drivers/mconsole_kern.c | 14 +++++++------ arch/um/drivers/ubd_kern.c | 36 ++++++++++++++++----------------- arch/um/kernel/exitcode.c | 43 +++++++++++++++++++++------------------- arch/um/kernel/process.c | 31 +++++++++++++++++++--------- 4 files changed, 70 insertions(+), 54 deletions(-)
arch/um/drivers/mconsole_kern.c +8 -6
@@ -833,8 +833,8 @@ static int __init mconsole_init(void)__initcall (mconsole_init); -static int write_proc_mconsole (struct file *file,const char __user *buffer, -unsigned long count,void *data) +static ssize_t mconsole_proc_write (struct file *file, +const char __user *buffer,size_t count,loff_t *pos) {char *buf;
@@ -855,6 +855,11 @@ static int write_proc_mconsole(struct file *file, const char __user *buffer,return count; } +static const struct file_operations mconsole_proc_fops = { + .owner =THIS_MODULE , + .write = mconsole_proc_write, +}; +static int create_proc_mconsole (void ) {struct proc_dir_entry *ent;
@@ -862,15 +867,12 @@ static int create_proc_mconsole(void)if (notify_socket ==NULL )return 0 ; - ent =create_proc_entry ("mconsole" ,S_IFREG |0200 ,NULL ); + ent =proc_create ("mconsole" ,0200 ,NULL , &mconsole_proc_fops);if (ent ==NULL ) {printk (KERN_INFO "create_proc_mconsole : create_proc_entry " "failed\n" );return 0 ; } - - ent->read_proc =NULL ; - ent->write_proc = write_proc_mconsole;return 0 ; }
arch/um/drivers/ubd_kern.c +18 -18
@@ -27,6 +27,7 @@#include "linux/init.h" #include "linux/cdrom.h" #include "linux/proc_fs.h" +#include "linux/seq_file.h" #include "linux/ctype.h" #include "linux/capability.h" #include "linux/mm.h"
@@ -200,23 +201,25 @@ static void make_proc_ide(void) proc_ide =proc_mkdir ("ide0" , proc_ide_root); } -static int proc_ide_read_media (char *page,char **start,off_t off,int count, -int *eof,void *data) +static int fake_ide_media_proc_show (struct seq_file *m,void *v) { -int len; - -strcpy (page,"disk\n" ); - len =strlen ("disk\n" ); - len -= off; -if (len < count){ - *eof =1 ; -if (len <=0 )return 0 ; - } -else len = count; - *start = page + off; -return len; +seq_puts (m,"disk\n" ); +return 0 ; +} + +static int fake_ide_media_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, fake_ide_media_proc_show,NULL ); } +static const struct file_operations fake_ide_media_proc_fops = { + .owner =THIS_MODULE , + .open = fake_ide_media_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; +static void make_ide_entries (const char *dev_name) {struct proc_dir_entry *dir, *ent;
@@ -227,11 +230,8 @@ static void make_ide_entries(const char *dev_name) dir =proc_mkdir (dev_name, proc_ide);if (!dir)return ; - ent =create_proc_entry ("media" ,S_IFREG |S_IRUGO , dir); + ent =proc_create ("media" ,S_IRUGO , dir, &fake_ide_media_proc_fops);if (!ent)return ; - ent->data =NULL ; - ent->read_proc = proc_ide_read_media; - ent->write_proc =NULL ;snprintf (name,sizeof (name),"ide0/%s" , dev_name);proc_symlink (dev_name, proc_ide_root, name); }
arch/um/kernel/exitcode.c +23 -20
80 lines not on this page · raw message
arch/um/kernel/process.c +21 -10
@@ -9,11 +9,13 @@#include <linux/hardirq.h> #include <linux/gfp.h> #include <linux/mm.h> +#include <linux/module.h> #include <linux/personality.h> #include <linux/proc_fs.h> #include <linux/ptrace.h> #include <linux/random.h> #include <linux/sched.h> +#include <linux/seq_file.h> #include <linux/tick.h> #include <linux/threads.h> #include <asm/current.h>
@@ -336,16 +338,19 @@ int get_using_sysemu(void)return atomic_read (&using_sysemu); } -static int proc_read_sysemu (char *buf,char **start,off_t offset,int size,int *eof,void *data) +static int sysemu_proc_show (struct seq_file *m,void *v) { -if (snprintf (buf, size,"%d\n" ,get_using_sysemu ()) < size) -/* No overflow */ - *eof =1 ; +seq_printf (m,"%d\n" ,get_using_sysemu ()); +return 0 ; +} -return strlen (buf); +static int sysemu_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, sysemu_proc_show,NULL ); } -static int proc_write_sysemu (struct file *file,const char __user *buf,unsigned long count,void *data) +static ssize_t sysemu_proc_write (struct file *file,const char __user *buf, +size_t count,loff_t *pos) {char tmp[2 ];
@@ -358,13 +363,22 @@ static int proc_write_sysemu(struct file *file,const char __user *buf, unsignedreturn count; } +static const struct file_operations sysemu_proc_fops = { + .owner =THIS_MODULE , + .open = sysemu_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, + .write = sysemu_proc_write, +}; +int __init make_proc_sysemu (void ) {struct proc_dir_entry *ent;if (!sysemu_supported)return 0 ; - ent =create_proc_entry ("sysemu" ,0600 ,NULL ); + ent =proc_create ("sysemu" ,0600 ,NULL , &sysemu_proc_fops);if (ent ==NULL ) {
@@ -372,9 +386,6 @@ int __init make_proc_sysemu(void)return 0 ; } - ent->read_proc = proc_read_sysemu; - ent->write_proc = proc_write_sysemu; -return 0 ; }