2007-10-12 15:58:58

by Jan Blunck

[permalink] [raw]
Subject: [PATCH] VFS: Remove lives_below_in_same_fs()

This is another cleanup which removes lives_below_in_same_fs() since
is_subdir() from fs/dcache.c is providing the same functionality and is more
widespreadly used.

Signed-off-by: Jan Blunck <[email protected]>
---
fs/namespace.c | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)

Index: b/fs/namespace.c
===================================================================
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1036,17 +1036,6 @@ static bool permit_mount(struct nameidat
return true;
}

-static int lives_below_in_same_fs(struct dentry *d, struct dentry *dentry)
-{
- while (1) {
- if (d == dentry)
- return 1;
- if (d == NULL || d == d->d_parent)
- return 0;
- d = d->d_parent;
- }
-}
-
struct vfsmount *copy_tree(struct vfsmount *mnt, struct dentry *dentry,
int flag, uid_t owner)
{
@@ -1063,7 +1052,7 @@ struct vfsmount *copy_tree(struct vfsmou

p = mnt;
list_for_each_entry(r, &mnt->mnt_mounts, mnt_child) {
- if (!lives_below_in_same_fs(r->mnt_mountpoint, dentry))
+ if (!is_subdir(r->mnt_mountpoint, dentry))
continue;

for (s = r; s; s = next_mnt(s, r)) {