UML: More varied improvements
PATCH 1/1 UML: More varied improvements
Hi, Jeff!
This patch also does some improvements for uml code. Improvements include dropping unnecessary cast, killing some unnecessary code and still some constifying for pointers etc..
--- arch/um/drivers/ubd_kern.c | 6 +++--- arch/um/include/kern_util.h | 2 +- arch/um/kernel/mem.c | 2 +- arch/um/kernel/process.c | 4 +--- arch/um/os-Linux/drivers/tuntap_user.c | 2 +- arch/um/os-Linux/mem.c | 7 ++++--- arch/um/os-Linux/sigio.c | 2 +- 7 files changed, 12 insertions(+), 13 deletions(-)
arch/um/drivers/ubd_kern.c +3 -3
@@ -229,7 +229,7 @@ static int proc_ide_read_media(char *page, char **start, off_t off, int count,return len; } -static void make_ide_entries (char *dev_name) +static void make_ide_entries (const char *dev_name) {struct proc_dir_entry *dir, *ent;char name[64 ];
@@ -244,7 +244,7 @@ static void make_ide_entries(char *dev_name) ent->data =NULL ; ent->read_proc = proc_ide_read_media; ent->write_proc =NULL ; -sprintf (name,"ide0/%s" , dev_name); +snprintf (name,sizeof (name),"ide0/%s" , dev_name);proc_symlink (dev_name, proc_ide_root, name); }
@@ -440,7 +440,7 @@ __uml_help(ubd_setup," an 's' will cause data to be written to disk on the host immediately.\n\n" ); -static int udb_setup (char *str) +static int udb_setup (const char *str) {printk ("udb%s specified on command line is almost certainly a ubd -> " "udb TYPO\n" , str);
arch/um/include/kern_util.h +1 -1
@@ -81,7 +81,7 @@ extern void do_uml_exitcalls(void);extern int attach_debugger (int idle_pid,int pid,int stop);extern int config_gdb (char *str);extern int remove_gdb (void ); -extern char *uml_strdup (char *string); +extern char *uml_strdup (const char *string);extern void unprotect_kernel_mem (void );extern void protect_kernel_mem (void );extern void uml_cleanup (void );
arch/um/kernel/mem.c +1 -1
@@ -65,7 +65,7 @@ static void setup_highmem(unsigned long highmem_start,void __init mem_init (void ) {/* clear the zero-page */ -memset ((void *) empty_zero_page,0 ,PAGE_SIZE ); +memset (empty_zero_page,0 ,PAGE_SIZE );/* Map in the area just after the brk now that kmalloc is about * to be turned on.
arch/um/kernel/process.c +1 -3
@@ -60,8 +60,6 @@ unsigned long alloc_stack(int order, int atomic)if (atomic) flags =GFP_ATOMIC ; page =__get_free_pages (flags, order); -if (page ==0 ) -return 0 ;return page; }
@@ -331,7 +329,7 @@ void do_uml_exitcalls(void) (*call)(); } -char *uml_strdup (char *string) +char *uml_strdup (const char *string) {return kstrdup (string,GFP_KERNEL ); }
arch/um/os-Linux/drivers/tuntap_user.c +1 -1
@@ -148,7 +148,7 @@ static int tuntap_open(void *data)memset (&ifr,0 ,sizeof (ifr)); ifr.ifr_flags =IFF_TAP |IFF_NO_PI ;strlcpy (ifr.ifr_name, pri->dev_name,sizeof (ifr.ifr_name)); -if (ioctl (pri->fd,TUNSETIFF , (void *) &ifr) <0 ) { +if (ioctl (pri->fd,TUNSETIFF , &ifr) <0 ) { err = -errno;printk (UM_KERN_ERR "TUNSETIFF failed, errno = %d\n" , errno);
arch/um/os-Linux/mem.c +4 -3
@@ -30,7 +30,7 @@ static char *tempdir = NULL;static void __init find_tempdir (void ) { -char *dirs[] = {"TMP" ,"TEMP" ,"TMPDIR" ,NULL }; +const char *dirs[] = {"TMP" ,"TEMP" ,"TMPDIR" ,NULL };int i;char *dir =NULL ;
@@ -59,9 +59,10 @@ static void __init find_tempdir(void)* read the file as needed. If there's an error, -errno is returned; * if the end of the file is reached, 0 is returned. */ -static int next (int fd,char *buf,int size,char c) +static int next (int fd,char *buf,size_t size,char c) { -int n, len; +ssize_t n; +size_t len;char *ptr;while ((ptr =strchr (buf, c)) ==NULL ){
arch/um/os-Linux/sigio.c +1 -1
@@ -407,7 +407,7 @@ static int async_pty(int master, int slave)if ((fcntl (slave,F_SETFL , flags |O_NONBLOCK ) <0 ))return -errno; -return (0 ); +return 0 ; }static void __init check_one_sigio (void (*proc)(int ,int ))
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
User-mode-linux-devel mailing list [email protected]
https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel
Quoted 3 lines · WANG Cong
This patch also does some improvements for uml code. Improvements include dropping unnecessary cast, killing some unnecessary code and still some constifying for pointers etc..
Looks good - I'll forward it along.
Jeff
Signature · 11 lines
Work email - jdike at linux dot intel dot com ------------------------------------------------------------------------- This SF.net email is sponsored by: Splunk Inc. Still grepping through log files to find problems? Stop. Now Search log events and configuration files using AJAX and a browser. Download your FREE copy of Splunk now >> http://get.splunk.com/ _______________________________________________ User-mode-linux-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/user-mode-linux-devel