compat ioctl: fix some build warnings
PATCH 1/1 compat ioctl: fix some build warnings
I got these warnings:
fs/compat_ioctl.c: In function ‘compat_sys_ioctl':fs/compat_ioctl.c:534: warning: ‘karg' may be used uninitialized in this function fs/compat_ioctl.c:533: warning: ‘kcmd' may be used uninitialized in this function fs/compat_ioctl.c:656: warning: ‘ret' may be used uninitialized in this function
These warnings are harmless, so just shut gcc up.
---
fs/compat_ioctl.c +3 -1
@@ -543,6 +543,8 @@ static int mt_ioctl_trans(unsigned int fd, unsigned int cmd, void __user *argp) kcmd =MTIOCGET ; karg = &get;break ; +default : +return -EINVAL ; }set_fs (KERNEL_DS ); err =sys_ioctl (fd, kcmd, (unsigned long )karg);
@@ -653,7 +655,7 @@ static int set_raw32_request(struct raw_config_request *req, struct raw32_configstatic int raw_ioctl (unsigned fd,unsigned cmd,struct raw32_config_request __user *user_req) { -int ret; +int ret = -EINVAL ;switch (cmd) {case RAW_SETBIND :
Quoted 28 lines · On Fri, 5 Feb 2010 02:05:56 -0500 Amerigo Wang <[email protected]> wrote:
I got these warnings:
fs/compat_ioctl.c: In function___compat_sys_ioctl':fs/compat_ioctl.c:534: warning:___karg' may be used uninitialized in this functionfs/compat_ioctl.c:533: warning:___kcmd' may be used uninitialized in this functionfs/compat_ioctl.c:656: warning:___ret' may be used uninitialized in this functionThese warnings are harmless, so just shut gcc up.
Signed-off-by WANG Cong <[email protected]>Cc Alexander Viro <[email protected]>Cc Arnd Bergmann <[email protected]>---
fs/compat_ioctl.c +2
-0@@ -543,6 +543,8 @@ static int mt_ioctl_trans(unsigned int fd, unsigned int cmd, void __user *argp) kcmd =MTIOCGET ; karg = &get;break ; +default : +return -EINVAL ; }set_fs (KERNEL_DS ); err =sys_ioctl (fd, kcmd, (unsigned long )karg);
fs/compat_ioctl.c static int set_raw32_request(struct raw_config_request *req, struct raw32_config · line 661
Quoted 8 lines
fs/compat_ioctl.c +1
-1@@ -653,7 +655,7 @@ static int set_raw32_request(struct raw_config_request *req, struct raw32_configstatic int raw_ioctl (unsigned fd,unsigned cmd,struct raw32_config_request __user *user_req) { -int ret; +int ret = -EINVAL ;switch (cmd) {case RAW_SETBIND :
Unfortunately that adds more code for something which cannot happen at runtime.
I guess we could do this trick:
fs/compat_ioctl.c renamed from fs/compat_ioctl.c~a +2 -2
@@ -539,7 +539,7 @@ static int mt_ioctl_trans(unsigned int f kcmd =MTIOCPOS ; karg = &pos;break ; -case MTIOCGET32 : +default :/* MTIOCGET32 */ kcmd =MTIOCGET ; karg = &get;break ;
@@ -657,7 +657,7 @@ static int raw_ioctl(unsigned fd, unsignswitch (cmd) {case RAW_SETBIND : -case RAW_GETBIND : { +default : {/* RAW_GETBIND */ struct raw_config_request req;mm_segment_t oldfs =get_fs ();
_
Which actually reduces code:
akpm:/usr/src/25> size fs/compat_ioctl.o
text data bss dec hex filename
9012 2232 2864 14108 371c fs/compat_ioctl.o
8968 2232 2848 14048 36e0 fs/compat_ioctl.o
Arnd Bergmann
Acked-byQuoted 17 lines · Andrew Morton
Unfortunately that adds more code for something which cannot happen at runtime.
I guess we could do this trick:
fs/compat_ioctl.c renamed from fs/compat_ioctl.c~a +1
-1@@ -539,7 +539,7 @@ static int mt_ioctl_trans(unsigned int f kcmd =MTIOCPOS ; karg = &pos;break ; -case MTIOCGET32 : +default :/* MTIOCGET32 */ kcmd =MTIOCGET ; karg = &get;break ;
fs/compat_ioctl.c static int raw_ioctl(unsigned fd, unsign · line 663
Quoted 8 lines
fs/compat_ioctl.c renamed from fs/compat_ioctl.c~a +1
-1@@ -657,7 +657,7 @@ static int raw_ioctl(unsigned fd, unsignswitch (cmd) {case RAW_SETBIND : -case RAW_GETBIND : { +default : {/* RAW_GETBIND */ struct raw_config_request req;mm_segment_t oldfs =get_fs ();
Looks good to me. Actually, we could just kill the switch/case statement in raw_ioctl entirely, but I wouldn't bother at this point any more because there are already patches from both Al and me to kill that function by moving it into drivers/char/raw.c
I need to check what happened to that patch and to the other patches I have removing code form fs/compat_ioctl.c, they might need to be updated before I can submit them for the next merge.
In the meantime,
Quoted 68 lines · Andrew Morton
Quoted 28 lines · On Fri, 5 Feb 2010 02:05:56 -0500 Amerigo Wang <[email protected]> wrote:
I got these warnings:
fs/compat_ioctl.c: In function___compat_sys_ioctl':fs/compat_ioctl.c:534: warning:___karg' may be used uninitialized in this functionfs/compat_ioctl.c:533: warning:___kcmd' may be used uninitialized in this functionfs/compat_ioctl.c:656: warning:___ret' may be used uninitialized in this functionThese warnings are harmless, so just shut gcc up.
Signed-off-by WANG Cong <[email protected]>Cc Alexander Viro <[email protected]>Cc Arnd Bergmann <[email protected]>---
fs/compat_ioctl.c +2
-0@@ -543,6 +543,8 @@ static int mt_ioctl_trans(unsigned int fd, unsigned int cmd, void __user *argp) kcmd =MTIOCGET ; karg = &get;break ; +default : +return -EINVAL ; }set_fs (KERNEL_DS ); err =sys_ioctl (fd, kcmd, (unsigned long )karg);fs/compat_ioctl.c static int set_raw32_request(struct raw_config_request *req, struct raw32_config · line 661
Quoted 8 lines
fs/compat_ioctl.c +1
-1@@ -653,7 +655,7 @@ static int set_raw32_request(struct raw_config_request *req, struct raw32_configstatic int raw_ioctl (unsigned fd,unsigned cmd,struct raw32_config_request __user *user_req) { -int ret; +int ret = -EINVAL ;switch (cmd) {case RAW_SETBIND :Unfortunately that adds more code for something which cannot happen at runtime.
I guess we could do this trick:
fs/compat_ioctl.c renamed from fs/compat_ioctl.c~a +2
-2@@ -539,7 +539,7 @@ static int mt_ioctl_trans(unsigned int f kcmd =MTIOCPOS ; karg = &pos;break ; -case MTIOCGET32 : +default :/* MTIOCGET32 */ kcmd =MTIOCGET ; karg = &get;break ;@@ -657,7 +657,7 @@ static int raw_ioctl(unsigned fd, unsignswitch (cmd) {case RAW_SETBIND : -case RAW_GETBIND : { +default : {/* RAW_GETBIND */ struct raw_config_request req;mm_segment_t oldfs =get_fs ();_
Quoted 8 lines
Which actually reduces code:
akpm:/usr/src/25> size
fs/compat_ioctl.o
text data bss dec hex filename
9012 2232 2864 14108 371cfs/compat_ioctl.o8968 2232 2848 14048 36e0 fs/compat_ioctl.o
Yeah! Definitely better.
Thanks, Andrew!