diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-30 07:50:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-06-30 07:50:04 +0200 |
| commit | 815ac67919148f9d65537af550fd26e2cbbd47bb (patch) | |
| tree | d52e131ad5f44e95722d9277bae74fc22d9a9a60 /include/linux/mount.h | |
| parent | acc902de05b2b8229dc27820925b7573b6d2d34e (diff) | |
| parent | d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af (diff) | |
Merge 6.16-rc4 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/mount.h')
| -rw-r--r-- | include/linux/mount.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/include/linux/mount.h b/include/linux/mount.h index 4880f434c021..1a508beba446 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -116,10 +116,8 @@ extern int may_umount_tree(struct vfsmount *); extern int may_umount(struct vfsmount *); 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 *); -extern int iterate_mounts(int (*)(struct vfsmount *, void *), void *, - struct vfsmount *); +extern struct path *collect_paths(const struct path *, struct path *, unsigned); +extern void drop_collected_paths(struct path *, struct path *); extern void kern_unmount_array(struct vfsmount *mnt[], unsigned int num); extern int cifs_root_data(char **dev, char **opts); |