2012-08-14 19:56:25

by Anna Schumaker

Subject: [PATCH] NFSD: Swap the struct nfs4_operation getter and setter

From: Bryan Schumaker <[email protected]>

stateid_setter should be matched to op_set_currentstateid, rather than
op_get_currentstateid.

Signed-off-by: Bryan Schumaker <[email protected]>
---
fs/nfsd/nfs4proc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index c9c1c0a..f2bb0ef 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1054,8 +1054,8 @@ struct nfsd4_operation {
char *op_name;
/* Try to get response size before operation */
nfsd4op_rsize op_rsize_bop;
- stateid_setter op_get_currentstateid;
- stateid_getter op_set_currentstateid;
+ stateid_getter op_get_currentstateid;
+ stateid_setter op_set_currentstateid;
};

static struct nfsd4_operation nfsd4_ops[];
--
1.7.11.4

2012-08-14 19:58:45

by J. Bruce Fields

Subject: Re: [PATCH] NFSD: Swap the struct nfs4_operation getter and setter

On Tue, Aug 14, 2012 at 03:55:08PM -0400, [email protected] wrote:
> From: Bryan Schumaker <[email protected]>
>
> stateid_setter should be matched to op_set_currentstateid, rather than
> op_get_currentstateid.

Why didn't we notice that?

Oh, the two prototypes are actually identical. Eh. OK, applying,
thanks.

--b.

>
> Signed-off-by: Bryan Schumaker <[email protected]>
> ---
> fs/nfsd/nfs4proc.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index c9c1c0a..f2bb0ef 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -1054,8 +1054,8 @@ struct nfsd4_operation {
> char *op_name;
> /* Try to get response size before operation */
> nfsd4op_rsize op_rsize_bop;
> - stateid_setter op_get_currentstateid;
> - stateid_getter op_set_currentstateid;
> + stateid_getter op_get_currentstateid;
> + stateid_setter op_set_currentstateid;
> };
>
> static struct nfsd4_operation nfsd4_ops[];
> --
> 1.7.11.4
>