fs: Fix return type of do_mount() from long to int

4f3b63e8 · Sentaro Onizuka <[email protected]> · 2025-01-14 00:14:00 +09:00

Fix the return type of do_mount() function from long to int to match its ac
tual behavior. The function only returns int values, and all callers, inclu
ding those in fs/namespace.c and arch/alpha/kernel/osf_sys.c, already treat
 the return value as int. This change improves type consistency across the
filesystem code and aligns the function signature with its existing impleme
ntation and usage.

Signed-off-by: Sentaro Onizuka <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Christian Brauner <[email protected]>

Commit: 4f3b63e8a8a28e3dcdcf3ff260f57a732a20b92b
Parents: 344af277

Changes

2 files changed · +2 −2

File	Status	Add	Del	Content
fs/namespace.c	modified	+1	−1	View file
include/linux/mount.h	modified	+1	−1	View file

fs/namespace.c

View file

diff --git a/fs/namespace.c b/fs/namespace.c
index 23e81c2..5d80877 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -3835,7 +3835,7 @@ int path_mount(const char *dev_name, struct path *path,
 			    data_page);
 }
 
-long do_mount(const char *dev_name, const char __user *dir_name,
+int do_mount(const char *dev_name, const char __user *dir_name,
 		const char *type_page, unsigned long flags, void *data_page)
 {
 	struct path path;

include/linux/mount.h

View file

diff --git a/include/linux/mount.h b/include/linux/mount.h
index 33f17b6..a7b472f 100644
--- a/include/linux/mount.h
+++ b/include/linux/mount.h
@@ -114,7 +114,7 @@ extern struct vfsmount *kern_mount(struct file_system_type *);
 extern void kern_unmount(struct vfsmount *mnt);
 extern int may_umount_tree(struct vfsmount *);
 extern int may_umount(struct vfsmount *);
-extern long do_mount(const char *, const char __user *,
+int do_mount(const char *, const char __user *,
 		     const char *, unsigned long, void *);
 extern struct vfsmount *collect_mounts(const struct path *);
 extern void drop_collected_mounts(struct vfsmount *);