split __lookup_mnt() in two functions
PATCH 15/17 split __lookup_mnt() in two functions
Instead of passing the direction as argument (and checking it on every step through the hash chain), just have separate __lookup_mnt() and __lookup_mnt_last(). And use the standard iterators...
Signed-off-by Al Viro <[email protected]>
--- fs/mount.h | 3 ++- fs/namei.c | 4 ++-- fs/namespace.c | 44 ++++++++++++++++++++++++-------------------- fs/pnode.c | 6 +++--- 4 files changed, 31 insertions(+), 26 deletions(-)
fs/mount.h +2 -1
@@ -77,7 +77,8 @@ static inline int is_mounted(struct vfsmount *mnt)return !IS_ERR_OR_NULL (real_mount (mnt)); } -extern struct mount *__lookup_mnt (struct vfsmount *,struct dentry *,int ); +extern struct mount *__lookup_mnt (struct vfsmount *,struct dentry *); +extern struct mount *__lookup_mnt_last (struct vfsmount *,struct dentry *);static inline void get_mnt_ns (struct mnt_namespace *ns) {
fs/namei.c +2 -2
@@ -1111,7 +1111,7 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path,if (!d_mountpoint (path->dentry))break ; - mounted =__lookup_mnt (path->mnt, path->dentry,1 ); + mounted =__lookup_mnt (path->mnt, path->dentry);if (!mounted)break ; path->mnt = &mounted->mnt;
@@ -1132,7 +1132,7 @@ static void follow_mount_rcu(struct nameidata *nd) {while (d_mountpoint (nd->path.dentry)) {struct mount *mounted; - mounted =__lookup_mnt (nd->path.mnt, nd->path.dentry,1 ); + mounted =__lookup_mnt (nd->path.mnt, nd->path.dentry);if (!mounted)break ; nd->path.mnt = &mounted->mnt;
fs/namespace.c +23 -19
59 lines not on this page · raw message
fs/pnode.c +3 -3
@@ -310,7 +310,7 @@ int propagate_mount_busy(struct mount *mnt, int refcnt)for (m =propagation_next (parent, parent); m; m =propagation_next (m, parent)) { - child =__lookup_mnt (&m->mnt, mnt->mnt_mountpoint,0 ); + child =__lookup_mnt_last (&m->mnt, mnt->mnt_mountpoint);if (child &&list_empty (&child->mnt_mounts) && (ret =do_refcount_check (child,1 )))break ;
@@ -332,8 +332,8 @@ static void __propagate_umount(struct mount *mnt)for (m =propagation_next (parent, parent); m; m =propagation_next (m, parent)) { -struct mount *child =__lookup_mnt (&m->mnt, - mnt->mnt_mountpoint,0 ); +struct mount *child =__lookup_mnt_last (&m->mnt, + mnt->mnt_mountpoint);/* * umount the child only if the child has no * other children
Signature · 1 line
1.7.2.5