Skip to content

Commit

Permalink
NFS: Fix a dependency on CONFIG_NFS_V4 in nfs_remount
Browse files Browse the repository at this point in the history
Fix the 'nfs4_fs_type' undeclared error in nfs_remount when compiling sans
NFSv4...

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Cc: Jeff Layton <jlayton@redhat.com>
  • Loading branch information
Trond Myklebust authored and Trond Myklebust committed Jul 9, 2008
1 parent e468bae commit cd10072
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions fs/nfs/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -1428,15 +1428,16 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data)
struct nfs_parsed_mount_data *data;
struct nfs_mount_data *options = (struct nfs_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
* them populated with default values. We have no way to know which
* ones were explicitly specified. Fall back to legacy behavior and
* just return success.
*/
if ((sb->s_type == &nfs4_fs_type && options4->version == 1) ||
(sb->s_type == &nfs_fs_type && options->version >= 1 &&
if ((nfsvers == 4 && options4->version == 1) ||
(nfsvers <= 3 && options->version >= 1 &&
options->version <= 6))
return 0;

Expand Down

0 comments on commit cd10072

Please sign in to comment.