Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1498611

[PATCH 8/8] vfs - remove unused have_submounts() function

Show all headers | View raw

Now that path_has_submounts() has been added have_submounts() is no
longer used so remove it.

Signed-off-by: Ian Kent <raven@themaw.net>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: Omar Sandoval <osandov@osandov.com>
---
 fs/dcache.c            |   33 ---------------------------------
 include/linux/dcache.h |    1 -
 2 files changed, 34 deletions(-)

diff --git a/fs/dcache.c b/fs/dcache.c
index 872f04e..719d8b4 100644
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -1273,39 +1273,6 @@ static void d_walk(struct dentry *parent, void *data,
 	goto again;
 }
 
-/*
- * Search for at least 1 mount point in the dentry's subdirs.
- * We descend to the next level whenever the d_subdirs
- * list is non-empty and continue searching.
- */
-
-static enum d_walk_ret check_mount(void *data, struct dentry *dentry)
-{
-	int *ret = data;
-	if (d_mountpoint(dentry)) {
-		*ret = 1;
-		return D_WALK_QUIT;
-	}
-	return D_WALK_CONTINUE;
-}
-
-/**
- * have_submounts - check for mounts over a dentry
- * @parent: dentry to check.
- *
- * Return true if the parent or its subdirectories contain
- * a mount point
- */
-int have_submounts(struct dentry *parent)
-{
-	int ret = 0;
-
-	d_walk(parent, &ret, check_mount, NULL);
-
-	return ret;
-}
-EXPORT_SYMBOL(have_submounts);
-
 struct check_mount {
 	struct vfsmount *mnt;
 	unsigned int mounted;
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index e351646..44a9a9b 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -254,7 +254,6 @@ extern struct dentry *d_find_alias(struct inode *);
 extern void d_prune_aliases(struct inode *);
 
 /* test whether we have any submounts in a subdir tree */
-extern int have_submounts(struct dentry *);
 extern int path_has_submounts(struct path *);
 
 /*

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 1/8] vfs - change d_manage() to take a struct path Ian Kent <raven@themaw.net> - 2016-10-11 07:40 +0200
  [PATCH 8/8] vfs - remove unused have_submounts() function Ian Kent <raven@themaw.net> - 2016-10-11 07:40 +0200
  [PATCH 7/8] autofs - use path_has_submounts() to fix unreliable  have_submount() checks Ian Kent <raven@themaw.net> - 2016-10-11 07:40 +0200
  [PATCH 5/8] autofs - change autofs4_wait() to take struct path Ian Kent <raven@themaw.net> - 2016-10-11 07:40 +0200
  [PATCH 3/8] vfs - add path_has_submounts() Ian Kent <raven@themaw.net> - 2016-10-11 07:40 +0200
  [PATCH 6/8] autofs - use path_is_mountpoint() to fix unreliable  d_mountpoint() checks Ian Kent <raven@themaw.net> - 2016-10-11 07:40 +0200
  [PATCH 4/8] autofs - change autofs4_expire_wait() to take struct  path Ian Kent <raven@themaw.net> - 2016-10-11 07:40 +0200
  Re: [PATCH 1/8] vfs - change d_manage() to take a struct path ebiederm@xmission.com (Eric W. Biederman) - 2016-10-11 18:10 +0200
    Re: [PATCH 1/8] vfs - change d_manage() to take a struct path Ian Kent <raven@themaw.net> - 2016-10-12 01:50 +0200

csiph-web