new helpers: lock_mount_hash/unlock_mount_hash
PATCH 12/17 new helpers: lock_mount_hash/unlock_mount_hash
aka br_write_{lock,unlock} of vfsmount_lock. Inlines in fs/mount.h, vfsmount_lock extern moved over there as well.
Signed-off-by Al Viro <[email protected]>
--- fs/internal.h | 4 -- fs/mount.h | 13 +++++++ fs/namespace.c | 96 ++++++++++++++++++++++++++++---------------------------- fs/pnode.c | 4 +- 4 files changed, 63 insertions(+), 54 deletions(-)
fs/internal.h +0 -4
@@ -9,8 +9,6 @@* 2 of the License, or (at your option) any later version. */ -#include <linux/lglock.h> -struct super_block ;struct file_system_type ;struct linux_binprm ;
@@ -62,8 +60,6 @@ extern int sb_prepare_remount_readonly(struct super_block *);extern void __init mnt_init (void ); -extern struct lglock vfsmount_lock; -extern int __mnt_want_write (struct vfsmount *);extern int __mnt_want_write_file (struct file *);extern void __mnt_drop_write (struct vfsmount *);
fs/mount.h +13 -0
@@ -1,6 +1,7 @@#include <linux/mount.h> #include <linux/seq_file.h> #include <linux/poll.h> +#include <linux/lglock.h> struct mnt_namespace {atomic_t count;
@@ -83,6 +84,18 @@ static inline void get_mnt_ns(struct mnt_namespace *ns)atomic_inc (&ns->count); } +extern struct lglock vfsmount_lock; + +static inline void lock_mount_hash (void ) +{ +br_write_lock (&vfsmount_lock); +} + +static inline void unlock_mount_hash (void ) +{ +br_write_unlock (&vfsmount_lock); +} +struct proc_mounts {struct seq_file m;struct mnt_namespace *ns;
fs/namespace.c +48 -48
307 lines not on this page · raw message
fs/pnode.c +2 -2
@@ -264,12 +264,12 @@ int propagate_mnt(struct mount *dest_mnt, struct mountpoint *dest_mp, prev_src_mnt = child; } out: -br_write_lock (&vfsmount_lock); +lock_mount_hash ();while (!list_empty (&tmp_list)) { child = list_first_entry(&tmp_list, struct mount, mnt_hash);umount_tree (child,0 ); } -br_write_unlock (&vfsmount_lock); +unlock_mount_hash ();return ret; }
Signature · 1 line
1.7.2.5