diff mbox

nfs: reject version and minorversion changes on remount attempts

Message ID 1382363505-6481-1-git-send-email-jlayton@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Jeff Layton Oct. 21, 2013, 1:51 p.m. UTC
Reported-by: Eric Doutreleau <edoutreleau@genoscope.cns.fr>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
---
 fs/nfs/super.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Jeff Layton Oct. 21, 2013, 1:54 p.m. UTC | #1
On Mon, 21 Oct 2013 09:51:45 -0400
Jeff Layton <jlayton@redhat.com> wrote:

> Reported-by: Eric Doutreleau <edoutreleau@genoscope.cns.fr>
> Signed-off-by: Jeff Layton <jlayton@redhat.com>
> ---
>  fs/nfs/super.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/fs/nfs/super.c b/fs/nfs/super.c
> index a03b9c6..137572b 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);
>  

Sorry for the resend here. There is no difference between this patch
and the one I sent last week, other than the addition of the
Reported-by tag.

Cheers,
diff mbox

Patch

diff --git a/fs/nfs/super.c b/fs/nfs/super.c
index a03b9c6..137572b 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);