diff options
| author | Jan Blunck <jblunck@suse.de> | 2008-04-29 00:59:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 08:06:06 -0700 |
| commit | 7ec02ef1596bb3c829a7e8b65ebf13b87faf1819 (patch) | |
| tree | d098192558b74f3b33634499ec6e60f3ee32bb47 | |
| parent | c5c8be3ce59dc59baf20b33dae3f8eb70af7b1f1 (diff) | |
| download | linux-3.10-7ec02ef1596bb3c829a7e8b65ebf13b87faf1819.tar.gz linux-3.10-7ec02ef1596bb3c829a7e8b65ebf13b87faf1819.tar.bz2 linux-3.10-7ec02ef1596bb3c829a7e8b65ebf13b87faf1819.zip | |
vfs: remove lives_below_in_same_fs()
Remove lives_below_in_same_fs() since is_subdir() from fs/dcache.c is
providing the same functionality.
Signed-off-by: Jan Blunck <jblunck@suse.de>
Acked-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
| -rw-r--r-- | fs/namespace.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/fs/namespace.c b/fs/namespace.c index fe376805cf5..061e5edb4d2 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -1176,17 +1176,6 @@ static int mount_is_safe(struct nameidata *nd) #endif } -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) { @@ -1203,7 +1192,7 @@ struct vfsmount *copy_tree(struct vfsmount *mnt, struct dentry *dentry, 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)) { |