Commit cd100725 authored by Trond Myklebust's avatar Trond Myklebust

NFS: Fix a dependency on CONFIG_NFS_V4 in nfs_remount

Fix the 'nfs4_fs_type' undeclared error in nfs_remount when compiling sans
NFSv4...
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
Cc: Jeff Layton <jlayton@redhat.com>
parent e468bae9
...@@ -1428,6 +1428,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) ...@@ -1428,6 +1428,7 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
struct nfs_parsed_mount_data *data; struct nfs_parsed_mount_data *data;
struct nfs_mount_data *options = (struct nfs_mount_data *)raw_data; struct nfs_mount_data *options = (struct nfs_mount_data *)raw_data;
struct nfs4_mount_data *options4 = (struct nfs4_mount_data *)raw_data; struct nfs4_mount_data *options4 = (struct nfs4_mount_data *)raw_data;
u32 nfsvers = nfss->nfs_client->rpc_ops->version;
/* /*
* Userspace mount programs that send binary options generally send * Userspace mount programs that send binary options generally send
...@@ -1435,8 +1436,8 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) ...@@ -1435,8 +1436,8 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
* ones were explicitly specified. Fall back to legacy behavior and * ones were explicitly specified. Fall back to legacy behavior and
* just return success. * just return success.
*/ */
if ((sb->s_type == &nfs4_fs_type && options4->version == 1) || if ((nfsvers == 4 && options4->version == 1) ||
(sb->s_type == &nfs_fs_type && options->version >= 1 && (nfsvers <= 3 && options->version >= 1 &&
options->version <= 6)) options->version <= 6))
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment