The patch titled Subject: fs: remove unused have_submounts() function has been removed from the -mm tree. Its filename was fs-remove-unused-have_submounts-function.patch This patch was dropped because an updated version will be merged ------------------------------------------------------ From: Ian Kent <raven@xxxxxxxxxx> Subject: fs: remove unused have_submounts() function Having added the have_local_submounts() function there are no remaining users of have_submounts() so remove it. Link: http://lkml.kernel.org/r/20160914061450.24714.99912.stgit@xxxxxxxxxxxxxxxx Signed-off-by: Ian Kent <raven@xxxxxxxxxx> Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx> Cc: Eric W. Biederman <ebiederm@xxxxxxxxxxxx> Cc: Omar Sandoval <osandov@xxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- fs/dcache.c | 33 --------------------------------- include/linux/dcache.h | 1 - 2 files changed, 34 deletions(-) diff -puN fs/dcache.c~fs-remove-unused-have_submounts-function fs/dcache.c --- a/fs/dcache.c~fs-remove-unused-have_submounts-function +++ a/fs/dcache.c @@ -1279,39 +1279,6 @@ rename_retry: * 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); - -/* - * 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_local_mount(void *data, struct dentry *dentry) { int *ret = data; diff -puN include/linux/dcache.h~fs-remove-unused-have_submounts-function include/linux/dcache.h --- a/include/linux/dcache.h~fs-remove-unused-have_submounts-function +++ a/include/linux/dcache.h @@ -254,7 +254,6 @@ extern struct dentry *d_find_alias(struc 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 have_local_submounts(struct dentry *); /* _ Patches currently in -mm which might be from raven@xxxxxxxxxx are autofs-fix-autofs4_fill_super-error-exit-handling.patch autofs-remove-ino-free-in-autofs4_dir_symlink.patch autofs-fix-dev-ioctl-number-range-check.patch autofs-add-autofs_dev_ioctl_version-for-autofs_dev_ioctl_version_cmd.patch autofs4-move-linux-auto_dev-ioctlh-to-uapi-linux.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html