Current is_local_mountpoint is a simple wrapper with added d_mountpoint
check. However, the same check is the first thing which
__is_local_mountpoint performs. So remove the wrapper and promote the
private helper to is_local_mountpoint. No semantics changes.
Signed-off-by: Nikolay Borisov <nborisov@xxxxxxxx>
---
fs/mount.h | 9 +--------
fs/namespace.c | 4 ++--
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/fs/mount.h b/fs/mount.h
index 711a4093e475..bdbd2ad79209 100644
--- a/fs/mount.h
+++ b/fs/mount.h
@@ -140,14 +140,7 @@ struct proc_mounts {
extern const struct seq_operations mounts_op;
-extern bool __is_local_mountpoint(struct dentry *dentry);
-static inline bool is_local_mountpoint(struct dentry *dentry)
-{
- if (!d_mountpoint(dentry))
- return false;
-
- return __is_local_mountpoint(dentry);
-}
+extern bool is_local_mountpoint(struct dentry *dentry);
static inline bool is_anon_ns(struct mnt_namespace *ns)
{
diff --git a/fs/namespace.c b/fs/namespace.c
index 85b5f7bea82e..6d1f00849ac6 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -649,7 +649,7 @@ struct vfsmount *lookup_mnt(const struct path *path)
}
/*
- * __is_local_mountpoint - Test to see if dentry is a mountpoint in the
+ * is_local_mountpoint - Test to see if dentry is a mountpoint in the
* current mount namespace.
*
* The common case is dentries are not mountpoints at all and that
@@ -663,7 +663,7 @@ struct vfsmount *lookup_mnt(const struct path *path)
* namespace not just a mount that happens to have some specified
* parent mount.
*/
-bool __is_local_mountpoint(struct dentry *dentry)
+bool is_local_mountpoint(struct dentry *dentry)
{
struct mnt_namespace *ns = current->nsproxy->mnt_ns;
struct mount *mnt;
--
2.17.1
