From: Sentaro Onizuka Date: Mon, 13 Jan 2025 15:14:00 +0000 (+0900) Subject: fs: Fix return type of do_mount() from long to int X-Git-Tag: v6.14-rc1~216^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f3b63e8a8a28e3dcdcf3ff260f57a732a20b92b;p=thirdparty%2Fkernel%2Flinux.git fs: Fix return type of do_mount() from long to int 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 Link: https://lore.kernel.org/r/20250113151400.55512-1-sentaro@amazon.com Signed-off-by: Christian Brauner --- diff --git a/fs/namespace.c b/fs/namespace.c index 23e81c2a1e3fe..5d808778a3aeb 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; diff --git a/include/linux/mount.h b/include/linux/mount.h index 33f17b6e87323..a7b472faec2ca 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 *);