summaryrefslogtreecommitdiff
path: root/fs/afs
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:52:28 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2017-02-09 15:52:28 +1100
commit2e3614587e9db328fbe36372b944ca2326becb60 (patch)
tree8a2813d39daf7c8dbb0732cebfbe83b0eca0a1a4 /fs/afs
parentd7e2f291d1fa942ed4d99ff70fff7082d5ab11f0 (diff)
parent1064f874abc0d05eeed8993815f584d847b72486 (diff)
Merge remote-tracking branch 'userns/for-next'
Diffstat (limited to 'fs/afs')
-rw-r--r--fs/afs/mntpt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/afs/mntpt.c b/fs/afs/mntpt.c
index 81dd075356b9..d4fb0afc0097 100644
--- a/fs/afs/mntpt.c
+++ b/fs/afs/mntpt.c
@@ -202,7 +202,7 @@ static struct vfsmount *afs_mntpt_do_automount(struct dentry *mntpt)
/* try and do the mount */
_debug("--- attempting mount %s -o %s ---", devname, options);
- mnt = vfs_kern_mount(&afs_fs_type, 0, devname, options);
+ mnt = vfs_submount(mntpt, &afs_fs_type, devname, options);
_debug("--- mount result %p ---", mnt);
free_page((unsigned long) devname);