diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-26 06:48:48 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-06-26 06:48:48 +0300 |
| commit | c5c2a8b497d69fb01d2563e383615a4eb69c72bc (patch) | |
| tree | 1e9757e4d643b6988a6841606d5c4a4d3043c850 /include | |
| parent | c4dce0c094a89b1bc8fde1163342bd6fe29c0370 (diff) | |
| parent | 0748e553df0225754c316a92af3a77fdc057b358 (diff) | |
| download | linux-c5c2a8b497d69fb01d2563e383615a4eb69c72bc.tar.xz | |
Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull mount fixes from Al Viro:
"Several mount-related fixes"
* tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
userns and mnt_idmap leak in open_tree_attr(2)
attach_recursive_mnt(): do not lock the covering tree when sliding something under it
replace collect_mounts()/drop_collected_mounts() with a safer variant
Diffstat (limited to 'include')
| -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); |