From c4796e66f55ca2af79a5983f55879327a8a6c46a Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Tue, 17 Jun 2008 16:12:00 -0400 Subject: [PATCH] --- yaml --- r: 101932 b: refs/heads/master c: cd100725620a8063fbc81bcf16d7c9e71a9583e0 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/nfs/super.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97e7c0f376b9..c8d5b07db654 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e468bae97d243fe0e1515abaa1f7d0edf1476ad0 +refs/heads/master: cd100725620a8063fbc81bcf16d7c9e71a9583e0 diff --git a/trunk/fs/nfs/super.c b/trunk/fs/nfs/super.c index a1065c1a3149..b880db18035b 100644 --- a/trunk/fs/nfs/super.c +++ b/trunk/fs/nfs/super.c @@ -1428,6 +1428,7 @@ 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 @@ -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 * 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;