| Message ID | 20250113151400.55512-1-sentaro@amazon.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | fs: Fix return type of do_mount() from long to int | expand |
On Tue, 14 Jan 2025 00:14:00 +0900, Sentaro Onizuka wrote: > 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. > > [...] Applied to the vfs-6.14.misc branch of the vfs/vfs.git tree. Patches in the vfs-6.14.misc branch should appear in linux-next soon. Please report any outstanding bugs that were missed during review in a new review to the original patch series allowing us to drop it. It's encouraged to provide Acked-bys and Reviewed-bys even though the patch has now been applied. If possible patch trailers will be updated. Note that commit hashes shown below are subject to change due to rebase, trailer updates or similar. If in doubt, please check the listed branch. tree: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git branch: vfs-6.14.misc [1/1] fs: Fix return type of do_mount() from long to int https://git.kernel.org/vfs/vfs/c/cd1db3448474
On Tue 14-01-25 00:14:00, Sentaro Onizuka wrote: > 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 <sentaro@amazon.com> Makes sense. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > fs/namespace.c | 2 +- > include/linux/mount.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/namespace.c b/fs/namespace.c > index 23e81c2a1e3f..5d808778a3ae 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 33f17b6e8732..a7b472faec2c 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 *); > -- > 2.39.5 (Apple Git-154) >
diff --git a/fs/namespace.c b/fs/namespace.c index 23e81c2a1e3f..5d808778a3ae 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 33f17b6e8732..a7b472faec2c 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 *);
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 <sentaro@amazon.com> --- fs/namespace.c | 2 +- include/linux/mount.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)