nfsd4: fix seqid_mutating_error
Subsystems (2)
PATCH 1/1 nfsd4: fix seqid_mutating_error
Yipes--noticed while doing some unrelated v4 state work. I'll probably send this along soonish.
--b.
commit 8eea0f78ed3f3238e238c8ca76e5c7a5c1e7b5f5
Author: J. Bruce Fields <[email protected]> Date: Wed Aug 10 19:16:22 2011 -0400
nfsd4: fix seqid_mutating_error
The set of errors here does *not* agree with the set of errors specified in the rfc!
While we're there, turn this macros into a function, for the usual reasons, and move it to the one place where it's actually used.
fs/nfsd/nfs4xdr.c +12 -0
@@ -1623,6 +1623,18 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) \ save = resp->p; +static bool seqid_mutating_err (__be32 err) +{ +/* rfc 3530 section 8.1.5: */ +return err != nfserr_stale_clientid && + err != nfserr_stale_stateid && + err != nfserr_bad_stateid && + err != nfserr_bad_seqid && + err != nfserr_bad_xdr && + err != nfserr_resource && + err != nfserr_nofilehandle; +} +/* * Routine for encoding the result of a "seqid-mutating" NFSv4 operation. This * is where sequence id's are incremented, and the replay cache is filled.
fs/nfsd/state.h +0 -6
@@ -447,12 +447,6 @@ struct nfs4_stateid {#define WR_STATE 0x00000020#define CLOSE_STATE 0x00000040 -#define seqid_mutating_err (err) \ - (((err) != nfserr_stale_clientid) && \ - ((err) != nfserr_bad_seqid) && \ - ((err) != nfserr_stale_stateid) && \ - ((err) != nfserr_bad_stateid)) -struct nfsd4_compound_state ; extern __be32 nfs4_preprocess_stateid_op(struct nfsd4_compound_state *cstate,
Quoted 28 lines · J. Bruce Fields
Yipes--noticed while doing some unrelated v4 state work. I'll probably send this along soonish.
--b.
commit
8eea0f78ed3f3238e238c8ca76e5c7a5c1e7b5f5Author: J. Bruce Fields <[email protected]> Date: Wed Aug 10 19:16:22 2011 -0400nfsd4: fix
seqid_mutating_errorThe set of errors here does *not* agree with the set of errors specified in the rfc!
While we're there, turn this macros into a function, for the usual reasons, and move it to the one place where it's actually used.
Signed-off-by J. Bruce Fields <[email protected]>fs/nfsd/nfs4xdr.c +0
-0@@ -1623,6 +1623,18 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) \ save = resp->p;
fs/nfsd/nfs4xdr.c static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) · line 1635
Quoted 10 lines
fs/nfsd/nfs4xdr.c +10
-0+static bool seqid_mutating_err (__be32 err) +{ +/* rfc 3530 section 8.1.5: */ +return err != nfserr_stale_clientid && + err != nfserr_stale_stateid && + err != nfserr_bad_stateid && + err != nfserr_bad_seqid && + err != nfserr_bad_xdr && + err != nfserr_resource && + err != nfserr_nofilehandle;
Any reason not to convert the above into a switch() statement while you are at it?
Trond
Signature · 6 lines
Trond Myklebust Linux NFS client maintainer NetApp [email protected] www.netapp.com
Quoted 14 lines · Trond Myklebust
Review
Quoted 10 lines · J. Bruce Fields
(quoted diff) +10
-0+static bool seqid_mutating_err(__be32 err) +{ + /* rfc 3530 section 8.1.5: */ + return err != nfserr_stale_clientid && + err != nfserr_stale_stateid && + err != nfserr_bad_stateid && + err != nfserr_bad_seqid && + err != nfserr_bad_xdr && + err != nfserr_resource && + err != nfserr_nofilehandle;Any reason not to convert the above into a
switch()statement while you are at it?
It would be more straightforward without the negatives.
Also, we've got two copies of this list. How about something like this?
--b.
commit 9ee2cabf7a814d48798380bc2cb8516645d1d0dc
Author: J. Bruce Fields <[email protected]> Date: Tue Aug 23 15:43:04 2011 -0400
nfsd4: cleanup and consolidate seqid_mutating_err
fs/nfs/nfs4_fs.h +0 -24
@@ -13,30 +13,6 @@struct idmap ; -/* -* In a seqid-mutating op, this macro controls which error return -* values trigger incrementation of the seqid. -* -* from rfc 3010: -* The client MUST monotonically increment the sequence number for the -* CLOSE, LOCK, LOCKU, OPEN, OPEN_CONFIRM, and OPEN_DOWNGRADE -* operations. This is true even in the event that the previous -* operation that used the sequence number received an error. The only -* exception to this rule is if the previous operation received one of -* the following errors: NFSERR_STALE_CLIENTID, NFSERR_STALE_STATEID, -* NFSERR_BAD_STATEID, NFSERR_BAD_SEQID, NFSERR_BADXDR, -* NFSERR_RESOURCE, NFSERR_NOFILEHANDLE. -* -*/ -#define seqid_mutating_err (err) \ -(((err) != NFSERR_STALE_CLIENTID) && \ - ((err) != NFSERR_STALE_STATEID) && \ - ((err) != NFSERR_BAD_STATEID) && \ - ((err) != NFSERR_BAD_SEQID) && \ - ((err) != NFSERR_BAD_XDR) && \ - ((err) != NFSERR_RESOURCE) && \ - ((err) != NFSERR_NOFILEHANDLE)) -enum nfs4_client_state {NFS4CLNT_MANAGER_RUNNING =0 ,NFS4CLNT_CHECK_LEASE ,
fs/nfsd/nfs4xdr.c +1 -13
@@ -1623,18 +1623,6 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) \ save = resp->p; -static bool seqid_mutating_err (__be32 err) -{ -/* rfc 3530 section 8.1.5: */ -return err != nfserr_stale_clientid && - err != nfserr_stale_stateid && - err != nfserr_bad_stateid && - err != nfserr_bad_seqid && - err != nfserr_bad_xdr && - err != nfserr_resource && - err != nfserr_nofilehandle; -} -/* * Routine for encoding the result of a "seqid-mutating" NFSv4 operation. This * is where sequence id's are incremented, and the replay cache is filled.
@@ -1643,7 +1631,7 @@ static bool seqid_mutating_err(__be32 err)*/ #define ENCODE_SEQID_OP_TAIL (stateowner) do { \ - if (seqid_mutating_err(nfserr) && stateowner) { \ + if (seqid_mutating_err(ntohl(nfserr)) && stateowner) { \ stateowner->so_seqid++; \ stateowner->so_replay.rp_status = nfserr; \ stateowner->so_replay.rp_buflen = \
include/linux/nfs4.h +16 -0
@@ -373,6 +373,22 @@ enum nfsstat4 { NFS4ERR_DELEG_REVOKED = 10087, /* deleg./layout revoked */ }; +static inline bool seqid_mutating_err (u32 err) +{ +/* rfc 3530 section 8.1.5: */ +switch (err) { +case NFS4ERR_STALE_CLIENTID : +case NFS4ERR_STALE_STATEID : +case NFS4ERR_BAD_STATEID : +case NFS4ERR_BAD_SEQID : +case NFS4ERR_BADXDR : +case NFS4ERR_RESOURCE : +case NFS4ERR_NOFILEHANDLE : +return false; + }; +return true; +} +/* * Note: NF4BAD is not actually part of the protocol; it is just used * internally by nfsd.
Quoted 44 lines
-----Original Message-----
From: J. Bruce Fields [mailto:[email protected]]
Sent: Tuesday, August 23, 2011 5:42 PM
To: Myklebust, Trond
Cc: [email protected]
Subject: Re: [PATCH] nfsd4: fixseqid_mutating_errorQuoted 13 lines · Trond Myklebust
Review
Quoted 10 lines · J. Bruce Fields
(quoted diff) +10
-0+static bool seqid_mutating_err(__be32 err) +{ + /* rfc 3530 section 8.1.5: */ + return err != nfserr_stale_clientid && + err != nfserr_stale_stateid && + err != nfserr_bad_stateid && + err != nfserr_bad_seqid && + err != nfserr_bad_xdr && + err != nfserr_resource && + err != nfserr_nofilehandle;Any reason not to convert the above into a
switch()statement whileyou
Quoted 1 line
are at it?
It would be more straightforward without the negatives.
Also, we've got two copies of this list. How about something like this?
--b.
commit
9ee2cabf7a814d48798380bc2cb8516645d1d0dcAuthor: J. Bruce Fields <[email protected]> Date: Tue Aug 23 15:43:04 2011 -0400nfsd4: cleanup and consolidate
seqid_mutating_errSigned-off-by J. Bruce Fields <[email protected]>fs/nfs/nfs4_fs.h +0
-0
fs/nfs/nfs4_fs.h line 21
Quoted 9 lines
fs/nfs/nfs4_fs.h +0
-6@@ -13,30 +13,6 @@struct idmap ; -/* -* In a seqid-mutating op, this macro controls which error return -* values trigger incrementation of the seqid. -* -* from rfc 3010: -* The client MUST monotonically increment the sequence number for
the
Quoted 5 lines
fs/nfs/nfs4_fs.h +0
-3-* CLOSE, LOCK, LOCKU, OPEN, OPEN_CONFIRM, and OPEN_DOWNGRADE -* operations. This is true even in the event that the previous -* operation that used the sequence number received an error. The only
- * exception to this rule is if the previous operation received one
of
Quoted 44 lines
- * the following errors:
NFSERR_STALE_CLIENTID,NFSERR_STALE_STATEID,
- *NFSERR_BAD_STATEID,NFSERR_BAD_SEQID,NFSERR_BADXDR,
- *NFSERR_RESOURCE,NFSERR_NOFILEHANDLE.
- *
- */fs/nfs/nfs4_fs.h +0
-9-#define seqid_mutating_err (err) \ -(((err) != NFSERR_STALE_CLIENTID) && \ - ((err) != NFSERR_STALE_STATEID) && \ - ((err) != NFSERR_BAD_STATEID) && \ - ((err) != NFSERR_BAD_SEQID) && \ - ((err) != NFSERR_BAD_XDR) && \ - ((err) != NFSERR_RESOURCE) && \ - ((err) != NFSERR_NOFILEHANDLE)) -enum nfs4_client_state {NFS4CLNT_MANAGER_RUNNING =0 ,NFS4CLNT_CHECK_LEASE ,fs/nfsd/nfs4xdr.c +0
-12@@ -1623,18 +1623,6 @@ static void write_cinfo(__be32 **p, struct nfsd4_change_info *c) \ save = resp->p; -static bool seqid_mutating_err (__be32 err) -{ -/* rfc 3530 section 8.1.5: */ -return err != nfserr_stale_clientid && - err != nfserr_stale_stateid && - err != nfserr_bad_stateid && - err != nfserr_bad_seqid && - err != nfserr_bad_xdr && - err != nfserr_resource && - err != nfserr_nofilehandle; -} -/* * Routine for encoding the result of a "seqid-mutating" NFSv4 operation. This
* is where sequence id's are incremented, and the replay cache is
filled.
fs/nfsd/nfs4xdr.c static bool seqid_mutating_err(__be32 err) · line 1633
Quoted 3 lines
fs/nfsd/nfs4xdr.c +0
-0@@ -1643,7 +1631,7 @@ static bool seqid_mutating_err(__be32 err)*/ #define ENCODE_SEQID_OP_TAIL (stateowner) do {
\
include/linux/nfs4.h enum nfsstat4 { · line 373
Quoted 11 lines
fs/nfsd/nfs4xdr.c +1
-1-if (seqid_mutating_err (nfserr) && stateowner) { \ +if (seqid_mutating_err (ntohl (nfserr)) && stateowner) { \ stateowner->so_seqid++; \ stateowner->so_replay.rp_status = nfserr; \ stateowner->so_replay.rp_buflen = \include/linux/nfs4.h +0
-0@@ -373,6 +373,22 @@ enum nfsstat4 { NFS4ERR_DELEG_REVOKED = 10087, /* deleg./layout revoked
*/
Quoted 11 lines
include/linux/nfs4.h +9
-0}; +static inline bool seqid_mutating_err (u32 err) +{ +/* rfc 3530 section 8.1.5: */ +switch (err) { +case NFS4ERR_STALE_CLIENTID : +case NFS4ERR_STALE_STATEID : +case NFS4ERR_BAD_STATEID : +case NFS4ERR_BAD_SEQID : +case NFS4ERR_BADXDR :
include/linux/nfs4.h enum nfsstat4 { · line 394
Quoted 10 lines
include/linux/nfs4.h +7
-0+case NFS4ERR_RESOURCE : +case NFS4ERR_NOFILEHANDLE : +return false; + }; +return true; +} +/* * Note: NF4BAD is not actually part of the protocol; it is just used * internally by nfsd.
Should we make it take a 's32' rather than a 'u32' argument? We do usually expect those errors to be signed.
Cheers
Trond
Quoted 25 lines · Trond
include/linux/nfs4.h enum nfsstat4 { · line 373
Quoted 8 lines
-----Original Message-----
From: J. Bruce Fields [mailto:[email protected]]include/linux/nfs4.h +0
-0@@ -373,6 +373,22 @@ enum nfsstat4 { NFS4ERR_DELEG_REVOKED = 10087, /* deleg./layout revoked*/
Quoted 16 lines
include/linux/nfs4.h +14
-0}; +static inline bool seqid_mutating_err (u32 err) +{ +/* rfc 3530 section 8.1.5: */ +switch (err) { +case NFS4ERR_STALE_CLIENTID : +case NFS4ERR_STALE_STATEID : +case NFS4ERR_BAD_STATEID : +case NFS4ERR_BAD_SEQID : +case NFS4ERR_BADXDR : +case NFS4ERR_RESOURCE : +case NFS4ERR_NOFILEHANDLE : +return false; + }; +return true;
Quoted 8 lines
include/linux/nfs4.h enum nfsstat4 { · line 394
Quoted 5 lines
include/linux/nfs4.h +2
-0+} +/* * Note: NF4BAD is not actually part of the protocol; it is just used * internally by nfsd. Should we make it take a 's32' rather than a 'u32' argument? We do usually expect those errors to be signed.
On the server side it's unsigned--bigendian in fact. The caller is:
Quoted 1 line
include/linux/nfs4.h
Quoted 1 line
include/linux/nfs4.h +1
-0+if (seqid_mutating_err (ntohl (nfserr)) && stateowner) { \
I put this in nfs4.h which is mostly protocol constants, and I figure u32 is the type closest to the relevant xdr, and we should convert as necessary in callers. I dunno.
--b.
Quoted 35 lines · J. Bruce Fields
Quoted 25 lines · Trond
include/linux/nfs4.h enum nfsstat4 { · line 373
Quoted 8 lines
-----Original Message-----
From: J. Bruce Fields [mailto:[email protected]]include/linux/nfs4.h +0
-0@@ -373,6 +373,22 @@ enum nfsstat4 { NFS4ERR_DELEG_REVOKED = 10087, /* deleg./layout revoked*/
Quoted 16 lines
include/linux/nfs4.h +14
-0}; +static inline bool seqid_mutating_err (u32 err) +{ +/* rfc 3530 section 8.1.5: */ +switch (err) { +case NFS4ERR_STALE_CLIENTID : +case NFS4ERR_STALE_STATEID : +case NFS4ERR_BAD_STATEID : +case NFS4ERR_BAD_SEQID : +case NFS4ERR_BADXDR : +case NFS4ERR_RESOURCE : +case NFS4ERR_NOFILEHANDLE : +return false; + }; +return true;Quoted 8 lines
include/linux/nfs4.h enum nfsstat4 { · line 394
Quoted 5 lines
include/linux/nfs4.h +2
-0+} +/* * Note: NF4BAD is not actually part of the protocol; it is just used * internally by nfsd. Should we make it take a 's32' rather than a 'u32' argument? We do usually expect those errors to be signed.
Quoted 7 lines
On the server side it's unsigned--bigendian in fact. The caller is:
Quoted 1 line
include/linux/nfs4.h
Quoted 1 line
include/linux/nfs4.h +1
-0+if (seqid_mutating_err (ntohl (nfserr)) && stateowner) { \I put this in
nfs4.hwhich is mostly protocol constants, and I figure u32 is the type closest to the relevant xdr, and we should convert as necessary in callers. I dunno.
(Translation: "I dunno" == "I have no strong opinion, but I'm sticking with this patch unless you want to write another".)
--b.