diff options
| author | Jeff Layton <jlayton@redhat.com> | 2013-10-18 10:03:37 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-10-28 14:30:23 -0400 |
| commit | 57acc40d73407159727b3a1456f0a498133831ba (patch) | |
| tree | f44ac3abe5bcf2e4792243b942a98c313b99b405 /fs/nfs/super.c | |
| parent | 3660cd4322fce986689b06225d9c12d77193c252 (diff) | |
| download | linux-57acc40d73407159727b3a1456f0a498133831ba.tar.gz linux-57acc40d73407159727b3a1456f0a498133831ba.tar.bz2 linux-57acc40d73407159727b3a1456f0a498133831ba.zip | |
nfs: reject version and minorversion changes on remount attempts
Reported-by: Eric Doutreleau <edoutreleau@genoscope.cns.fr>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/super.c')
| -rw-r--r-- | fs/nfs/super.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index a03b9c6f9489..137572bb7037 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c @@ -2143,6 +2143,8 @@ nfs_compare_remount_data(struct nfs_server *nfss, if (data->flags != nfss->flags || data->rsize != nfss->rsize || data->wsize != nfss->wsize || + data->version != nfss->nfs_client->rpc_ops->version || + data->minorversion != nfss->nfs_client->cl_minorversion || data->retrans != nfss->client->cl_timeout->to_retries || data->auth_flavors[0] != nfss->client->cl_auth->au_flavor || data->acregmin != nfss->acregmin / HZ || @@ -2197,6 +2199,8 @@ nfs_remount(struct super_block *sb, int *flags, char *raw_data) data->timeo = 10U * nfss->client->cl_timeout->to_initval / HZ; data->nfs_server.port = nfss->port; data->nfs_server.addrlen = nfss->nfs_client->cl_addrlen; + data->version = nfsvers; + data->minorversion = nfss->nfs_client->cl_minorversion; memcpy(&data->nfs_server.address, &nfss->nfs_client->cl_addr, data->nfs_server.addrlen); |