nfsd41: modify the members value of nfsd4_op_flags

PATCH In review Mi Jinlong 3 participants 4 messages Feb 17, 2011 – Mar 7, 2011

Subsystems (2)

NFS client NFS server

lore

Share & tools

lore

Mi Jinlong

author

2011-02-17 09:02 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---
 fs/nfsd/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

fs/nfsd/nfs4proc.c +3 -3

index db52546..8605d38 100644
@@ -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 {

Signature · 1 line

1.7.4.1

Benny Halevy

2011-02-17 13:41 UTC #1 lore raw

BTW, any particular reason you sent this to Chuck and not Bruce <[email protected]> who's the nfs server maintainer?

Quoted 19 lines · Mi Jinlong

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 <[email protected]>
---
 fs/nfsd/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
fs/nfsd/nfs4proc.c +0 -0
index db52546..8605d38 100644

fs/nfsd/nfs4proc.c static inline void nfsd4_increment_op_stats(u32 opnum) · line 988

Quoted 9 lines

fs/nfsd/nfs4proc.c +3 -3

@@ -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

Quoted 3 lines

fs/nfsd/nfs4proc.c +0 -0
 };
 
 struct nfsd4_operation {

Mi Jinlong

author

2011-02-18 01:09 UTC #2 lore raw

Quoted 2 lines · Benny Halevy

BTW, any particular reason you sent this to Chuck and not Bruce <[email protected]> who's the nfs server maintainer?

Sorry for my mistake.

Quoted 16 lines · Mi Jinlong

Quoted 14 lines
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 <[email protected]>
---
 fs/nfsd/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

Quoted 16 lines

Quoted 5 lines

fs/nfsd/nfs4proc.c +0 -0
index db52546..8605d38 100644

fs/nfsd/nfs4proc.c static inline void nfsd4_increment_op_stats(u32 opnum) · line 988

Quoted 9 lines

fs/nfsd/nfs4proc.c +3 -3

@@ -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.

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

J. Bruce Fields

2011-03-07 17:11 UTC #3 lore raw

Quoted 41 lines · Mi Jinlong

Quoted 2 lines · Benny Halevy
BTW, any particular reason you sent this to Chuck and not Bruce <[email protected]> who's the nfs server maintainer?
Sorry for my mistake.
Quoted 16 lines · Mi Jinlong
Quoted 14 lines
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 <[email protected]>
---
 fs/nfsd/nfs4proc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
Quoted 16 lines
Quoted 5 lines
fs/nfsd/nfs4proc.c +0 -0
index db52546..8605d38 100644
fs/nfsd/nfs4proc.c static inline void nfsd4_increment_op_stats(u32 opnum) · line 988
Quoted 9 lines
fs/nfsd/nfs4proc.c +3 -3
@@ -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 :)

Quoted 1 line

Thanks for your advice.

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

--b.

Quoted 44 lines

--------------------------------------------
Quoted 1 line
From b01bae649293d160af07dde30fde6aa3ac7f8759 Mon Sep 17 00:00:00 2001
From: Mi Jinlong <[email protected]>
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 <[email protected]>
---
 fs/nfsd/nfs4proc.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
fs/nfsd/nfs4proc.c +2 -2
index db52546..5fcb139 100644
@@ -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 {
Signature · 7 lines
1.7.4.1


--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html