diff options
author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-10 12:04:15 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2012-07-10 13:25:39 -0400 |
commit | f1daf666dd7d097653bd38320248c68084b1febf (patch) | |
tree | 4bf9ba079430463b352fb44e3aa03d0b1b4284d5 /fs/nfs/super.c | |
parent | 4035c2487f179327fae87af3477659402b797584 (diff) |
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>
Diffstat (limited to 'fs/nfs/super.c')
-rw-r--r-- | fs/nfs/super.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index 906f09c7d842..06228192f64e 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, | |||
2860 | 2860 | ||
2861 | dfprintk(MOUNT, "--> nfs4_try_mount()\n"); | 2861 | dfprintk(MOUNT, "--> nfs4_try_mount()\n"); |
2862 | 2862 | ||
2863 | mount_info->fill_super = nfs4_fill_super; | ||
2864 | |||
2863 | export_path = data->nfs_server.export_path; | 2865 | export_path = data->nfs_server.export_path; |
2864 | data->nfs_server.export_path = "/"; | 2866 | data->nfs_server.export_path = "/"; |
2865 | root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, mount_info, | 2867 | root_mnt = nfs_do_root_mount(&nfs4_remote_fs_type, flags, mount_info, |