linux-nfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] nfsd41: modify the members value of nfsd4_op_flags
@ 2011-02-17  9:02 Mi Jinlong
  2011-02-17 13:41 ` Benny Halevy
  0 siblings, 1 reply; 4+ messages in thread
From: Mi Jinlong @ 2011-02-17  9:02 UTC (permalink / raw)
  To: Chuck Lever; +Cc: NFS, andros, bhalevy

The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS)
equals to  ALLOWED_AS_FIRST_OP, maybe that's not what we want.

OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
can't appears as the first operation with out SEQUENCE ops.

This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which 
was introduced by f9bb94c4.

Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
---
 fs/nfsd/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index db52546..8605d38 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -983,9 +983,9 @@ static inline void nfsd4_increment_op_stats(u32 opnum)
 typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
 			      void *);
 enum nfsd4_op_flags {
-	ALLOWED_WITHOUT_FH = 1 << 0,	/* No current filehandle required */
-	ALLOWED_ON_ABSENT_FS = 2 << 0,	/* ops processed on absent fs */
-	ALLOWED_AS_FIRST_OP = 3 << 0,	/* ops reqired first in compound */
+	ALLOWED_WITHOUT_FH = 1 << 1,	/* No current filehandle required */
+	ALLOWED_ON_ABSENT_FS = 1 << 2,	/* ops processed on absent fs */
+	ALLOWED_AS_FIRST_OP = 1 << 3,	/* ops reqired first in compound */
 };
 
 struct nfsd4_operation {
-- 
1.7.4.1





^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH] nfsd41: modify the members value of nfsd4_op_flags
  2011-02-17  9:02 [PATCH] nfsd41: modify the members value of nfsd4_op_flags Mi Jinlong
@ 2011-02-17 13:41 ` Benny Halevy
  2011-02-18  1:09   ` Mi Jinlong
  0 siblings, 1 reply; 4+ messages in thread
From: Benny Halevy @ 2011-02-17 13:41 UTC (permalink / raw)
  To: Mi Jinlong; +Cc: Chuck Lever, NFS, andros, J. Bruce Fields

BTW, any particular reason you sent this to Chuck and not Bruce <bfields@redhat.com>
who's the nfs server maintainer?

On 2011-02-17 04:02, Mi Jinlong wrote:
> The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS)
> equals to  ALLOWED_AS_FIRST_OP, maybe that's not what we want.
> 
> OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
> can't appears as the first operation with out SEQUENCE ops.
> 
> This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which 
> was introduced by f9bb94c4.
> 
> Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
> ---
>  fs/nfsd/nfs4proc.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index db52546..8605d38 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -983,9 +983,9 @@ static inline void nfsd4_increment_op_stats(u32 opnum)
>  typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
>  			      void *);
>  enum nfsd4_op_flags {
> -	ALLOWED_WITHOUT_FH = 1 << 0,	/* No current filehandle required */
> -	ALLOWED_ON_ABSENT_FS = 2 << 0,	/* ops processed on absent fs */
> -	ALLOWED_AS_FIRST_OP = 3 << 0,	/* ops reqired first in compound */
> +	ALLOWED_WITHOUT_FH = 1 << 1,	/* No current filehandle required */
> +	ALLOWED_ON_ABSENT_FS = 1 << 2,	/* ops processed on absent fs */
> +	ALLOWED_AS_FIRST_OP = 1 << 3,	/* ops reqired first in compound */

Right, just 1 << {0,1,2} would make more sense :)

Benny

>  };
>  
>  struct nfsd4_operation {

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] nfsd41: modify the members value of nfsd4_op_flags
  2011-02-17 13:41 ` Benny Halevy
@ 2011-02-18  1:09   ` Mi Jinlong
  2011-03-07 17:11     ` J. Bruce Fields
  0 siblings, 1 reply; 4+ messages in thread
From: Mi Jinlong @ 2011-02-18  1:09 UTC (permalink / raw)
  To: Benny Halevy, J. Bruce Fields; +Cc: Chuck Lever, NFS, andros



Benny Halevy 写道:
> BTW, any particular reason you sent this to Chuck and not Bruce <bfields@redhat.com>
> who's the nfs server maintainer?

  Sorry for my mistake. 

> 
> On 2011-02-17 04:02, Mi Jinlong wrote:
>> The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS)
>> equals to  ALLOWED_AS_FIRST_OP, maybe that's not what we want.
>>
>> OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
>> can't appears as the first operation with out SEQUENCE ops.
>>
>> This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which 
>> was introduced by f9bb94c4.
>>
>> Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
>> ---
>>  fs/nfsd/nfs4proc.c |    6 +++---
>>  1 files changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
>> index db52546..8605d38 100644
>> --- a/fs/nfsd/nfs4proc.c
>> +++ b/fs/nfsd/nfs4proc.c
>> @@ -983,9 +983,9 @@ static inline void nfsd4_increment_op_stats(u32 opnum)
>>  typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
>>  			      void *);
>>  enum nfsd4_op_flags {
>> -	ALLOWED_WITHOUT_FH = 1 << 0,	/* No current filehandle required */
>> -	ALLOWED_ON_ABSENT_FS = 2 << 0,	/* ops processed on absent fs */
>> -	ALLOWED_AS_FIRST_OP = 3 << 0,	/* ops reqired first in compound */
>> +	ALLOWED_WITHOUT_FH = 1 << 1,	/* No current filehandle required */
>> +	ALLOWED_ON_ABSENT_FS = 1 << 2,	/* ops processed on absent fs */
>> +	ALLOWED_AS_FIRST_OP = 1 << 3,	/* ops reqired first in compound */
> 
> Right, just 1 << {0,1,2} would make more sense :)

  Thanks for your advice.

--------------------------------------------

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH] nfsd41: modify the members value of nfsd4_op_flags
  2011-02-18  1:09   ` Mi Jinlong
@ 2011-03-07 17:11     ` J. Bruce Fields
  0 siblings, 0 replies; 4+ messages in thread
From: J. Bruce Fields @ 2011-03-07 17:11 UTC (permalink / raw)
  To: Mi Jinlong; +Cc: Benny Halevy, J. Bruce Fields, Chuck Lever, NFS, andros

On Fri, Feb 18, 2011 at 09:09:54AM +0800, Mi Jinlong wrote:
> 
> 
> Benny Halevy 写道:
> > BTW, any particular reason you sent this to Chuck and not Bruce <bfields@redhat.com>
> > who's the nfs server maintainer?
> 
>   Sorry for my mistake. 
> 
> > 
> > On 2011-02-17 04:02, Mi Jinlong wrote:
> >> The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS)
> >> equals to  ALLOWED_AS_FIRST_OP, maybe that's not what we want.
> >>
> >> OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
> >> can't appears as the first operation with out SEQUENCE ops.
> >>
> >> This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which 
> >> was introduced by f9bb94c4.
> >>
> >> Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
> >> ---
> >>  fs/nfsd/nfs4proc.c |    6 +++---
> >>  1 files changed, 3 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> >> index db52546..8605d38 100644
> >> --- a/fs/nfsd/nfs4proc.c
> >> +++ b/fs/nfsd/nfs4proc.c
> >> @@ -983,9 +983,9 @@ static inline void nfsd4_increment_op_stats(u32 opnum)
> >>  typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
> >>  			      void *);
> >>  enum nfsd4_op_flags {
> >> -	ALLOWED_WITHOUT_FH = 1 << 0,	/* No current filehandle required */
> >> -	ALLOWED_ON_ABSENT_FS = 2 << 0,	/* ops processed on absent fs */
> >> -	ALLOWED_AS_FIRST_OP = 3 << 0,	/* ops reqired first in compound */
> >> +	ALLOWED_WITHOUT_FH = 1 << 1,	/* No current filehandle required */
> >> +	ALLOWED_ON_ABSENT_FS = 1 << 2,	/* ops processed on absent fs */
> >> +	ALLOWED_AS_FIRST_OP = 1 << 3,	/* ops reqired first in compound */
> > 
> > Right, just 1 << {0,1,2} would make more sense :)
> 
>   Thanks for your advice.

Thanks for catching this, and apologies for the delay; queueing up for
2.6.39.

--b.

> 
> --------------------------------------------
> >From b01bae649293d160af07dde30fde6aa3ac7f8759 Mon Sep 17 00:00:00 2001
> From: Mi Jinlong <mijinlong@cn.fujitsu.com>
> Date: Fri, 18 Feb 2011 09:08:31 +0800
> Subject: [PATCH] nfsd41: modify the members value of nfsd4_op_flags
> 
> The members of nfsd4_op_flags, (ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS)
> equals to  ALLOWED_AS_FIRST_OP, maybe that's not what we want.
> 
> OP_PUTROOTFH with op_flags = ALLOWED_WITHOUT_FH | ALLOWED_ON_ABSENT_FS,
> can't appears as the first operation with out SEQUENCE ops.
> 
> This patch modify the wrong value of ALLOWED_WITHOUT_FH etc which 
> was introduced by f9bb94c4.
> 
> Signed-off-by: Mi Jinlong <mijinlong@cn.fujitsu.com>
> ---
>  fs/nfsd/nfs4proc.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index db52546..5fcb139 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -984,8 +984,8 @@ typedef __be32(*nfsd4op_func)(struct svc_rqst *, struct nfsd4_compound_state *,
>  			      void *);
>  enum nfsd4_op_flags {
>  	ALLOWED_WITHOUT_FH = 1 << 0,	/* No current filehandle required */
> -	ALLOWED_ON_ABSENT_FS = 2 << 0,	/* ops processed on absent fs */
> -	ALLOWED_AS_FIRST_OP = 3 << 0,	/* ops reqired first in compound */
> +	ALLOWED_ON_ABSENT_FS = 1 << 1,	/* ops processed on absent fs */
> +	ALLOWED_AS_FIRST_OP = 1 << 2,	/* ops reqired first in compound */
>  };
>  
>  struct nfsd4_operation {
> -- 
> 1.7.4.1
> 
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2011-03-07 17:11 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-17  9:02 [PATCH] nfsd41: modify the members value of nfsd4_op_flags Mi Jinlong
2011-02-17 13:41 ` Benny Halevy
2011-02-18  1:09   ` Mi Jinlong
2011-03-07 17:11     ` J. Bruce Fields

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).