vfs: remove a warning on OPEN_FMODE()
Subsystems (3)
PATCH 1/2 vfs: remove a warning on OPEN_FMODE()
AND-ing FMODE_* constant with normal integer results in following sparse warnings. Fix it.
fs/open.c:662:21: warning: restricted fmode_t degrades to integer fs/anon_inodes.c:123:34: warning: restricted fmode_t degrades to integer
Signed-off-by Namhyung Kim <[email protected]>
--- include/linux/fs.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-)
include/linux/fs.h +3 -1
@@ -2477,9 +2477,11 @@ int proc_nr_files(struct ctl_table *table, int write,int __init get_filesystem_list (char *buf); +#define __FMODE_NONOTIFY ((__force int) FMODE_NONOTIFY) +#define ACC_MODE (x) ("\004\002\006\006"[(x)&O_ACCMODE])#define OPEN_FMODE (flag) ((__force fmode_t)(((flag + 1) & O_ACCMODE) | \ - (flag & FMODE_NONOTIFY))) + (flag & __FMODE_NONOTIFY)))#endif /* __KERNEL__ */ #endif /* _LINUX_FS_H */
Signature · 1 line
1.7.2.2
PATCH 2/2 vfs: add __FMODE_EXEC
FMODE_EXEC is a constant type of fmode_t but was used with normal integer constants. This results in following warnings from sparse. Fix it using new macro __FMODE_EXEC.
fs/exec.c:116:58: warning: restricted fmode_t degrades to integer fs/exec.c:689:58: warning: restricted fmode_t degrades to integer fs/fcntl.c:777:9: warning: restricted fmode_t degrades to integer
Signed-off-by Namhyung Kim <[email protected]>
--- fs/exec.c | 4 ++-- fs/fcntl.c | 2 +- include/linux/fs.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-)
fs/exec.c +2 -2
@@ -113,7 +113,7 @@ SYSCALL_DEFINE1(uselib, const char __user *, library) goto out; file =do_filp_open (AT_FDCWD , tmp, -O_LARGEFILE |O_RDONLY |FMODE_EXEC ,0 , +O_LARGEFILE |O_RDONLY | __FMODE_EXEC,0 ,MAY_READ |MAY_EXEC |MAY_OPEN );putname (tmp); error =PTR_ERR (file);
@@ -686,7 +686,7 @@ struct file *open_exec(const char *name)int err; file =do_filp_open (AT_FDCWD , name, -O_LARGEFILE |O_RDONLY |FMODE_EXEC ,0 , +O_LARGEFILE |O_RDONLY | __FMODE_EXEC,0 ,MAY_EXEC |MAY_OPEN );if (IS_ERR (file)) goto out;
fs/fcntl.c +1 -1
@@ -781,7 +781,7 @@ static int __init fcntl_init(void) __O_SYNC |O_DSYNC |FASYNC |O_DIRECT |O_LARGEFILE |O_DIRECTORY |O_NOFOLLOW |O_NOATIME |O_CLOEXEC | -FMODE_EXEC + __FMODE_EXEC )); fasync_cache = kmem_cache_create("fasync_cache",
include/linux/fs.h +1 -0
@@ -2477,6 +2477,7 @@ int proc_nr_files(struct ctl_table *table, int write,int __init get_filesystem_list (char *buf); +#define __FMODE_EXEC ((__force int) FMODE_EXEC)#define __FMODE_NONOTIFY ((__force int) FMODE_NONOTIFY)#define ACC_MODE (x) ("\004\002\006\006"[(x)&O_ACCMODE])
Signature · 1 line
1.7.2.2