Merge tag 'for-linus-4.10-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / fs / dcache.c

diff --git a/fs/dcache.c b/fs/dcache.c
index 8515875854b6dd91907e39e5c8b7b4773b6876b1..769903dbc19df53199b4aca2e79607145e179c98 100644 (file)
--- a/fs/dcache.c
+++ b/fs/dcache.c
@@ -26,7 +26,7 @@
 #include <linux/export.h>
 #include <linux/mount.h>
 #include <linux/file.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/security.h>
 #include <linux/seqlock.h>
 #include <linux/swap.h>
@@ -1273,39 +1273,6 @@ rename_retry:
        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;