summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2012-07-10 12:04:15 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2012-07-10 13:25:39 -0400
commitf1daf666dd7d097653bd38320248c68084b1febf (patch)
tree4bf9ba079430463b352fb44e3aa03d0b1b4284d5
parent4035c2487f179327fae87af3477659402b797584 (diff)
downloadop-kernel-dev-f1daf666dd7d097653bd38320248c68084b1febf.zip
op-kernel-dev-f1daf666dd7d097653bd38320248c68084b1febf.tar.gz
NFSv4: Fix an NFSv4 mount regression
The helper nfs_fs_mount() will always call nfs4_try_mount with the mount_info->fill_super argument pointing to nfs_fill_super, which is NFSv2/v3 only. Fix is to have nfs4_try_mount replace it with nfs4_fill_super. The regression was introduced by commit c40f8d1d (NFS: Create a common fs_mount() function) Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
-rw-r--r--fs/nfs/super.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index 906f09c..0622819 100644
--- a/fs/nfs/super.c
+++ b/fs/nfs/super.c
@@ -2860,6 +2860,8 @@ static struct dentry *nfs4_try_mount(int flags, const char *dev_name,
dfprintk(MOUNT, "--> nfs4_try_mount()\n");
+ mount_info->fill_super = nfs4_fill_super;
+
export_path = data->nfs_server.export_path;
data->nfs_server.export_path = "/";
root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, mount_info,
OpenPOWER on IntegriCloud