Skip to contentSkip to conversation

vfs: sparse: add __FMODE_EXEC

PATCH In review [email protected] 1 participant 1 message Oct 1, 2010

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 3/3 vfs: sparse: add __FMODE_EXEC

From: Namhyung Kim <[email protected]>

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

---

 fs/exec.c          |    4 ++--
 fs/fcntl.c         |    2 +-
 include/linux/fs.h |    1 +
 3 files changed, 4 insertions(+), 3 deletions(-)
fs/exec.c renamed from fs/exec.c~vfs-add-__fmode_exec +2 -2
diff -puN fs/exec.c~vfs-add-__fmode_exec fs/exec.c
@@ -113,7 +113,7 @@ SYSCALL_DEFINE1(uselib, const char __use
 		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 renamed from fs/fcntl.c~vfs-add-__fmode_exec +1 -1
diff -puN fs/fcntl.c~vfs-add-__fmode_exec fs/fcntl.c
@@ -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 renamed from include/linux/fs.h~vfs-add-__fmode_exec +1 -0
diff -puN include/linux/fs.h~vfs-add-__fmode_exec include/linux/fs.h
@@ -2490,6 +2490,7 @@ int proc_nr_files(struct ctl_table *tabl
 
 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])

_