summaryrefslogtreecommitdiff
path: root/fs/namespace.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-13 12:11:40 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-01-13 12:11:40 +0100
commit845f081002eebd7a1216fc0a5ef2c862dc6d093e (patch)
tree41f5ee3829836aafc4d872edf2c2e22390ae6034 /fs/namespace.c
parent585c91f40d201bc564d4e76b83c05b3b5363fe7e (diff)
parentb3a987b0264d3ddbb24293ebff10eddfc472f653 (diff)
Merge 5.5-rc6 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'fs/namespace.c')
-rw-r--r--fs/namespace.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/namespace.c b/fs/namespace.c
index be601d3a8008..5e1bf611a9eb 100644
--- a/fs/namespace.c
+++ b/fs/namespace.c
@@ -1728,7 +1728,7 @@ static bool is_mnt_ns_file(struct dentry *dentry)
dentry->d_fsdata == &mntns_operations;
}
-struct mnt_namespace *to_mnt_ns(struct ns_common *ns)
+static struct mnt_namespace *to_mnt_ns(struct ns_common *ns)
{
return container_of(ns, struct mnt_namespace, ns);
}