[PATCH] nfsd: nfs_replay_me

We are using NFS_REPLAY_ME as a special error value that is never leaked to
clients.  That works fine; the only problem is mixing host- and network-
endian values in the same objects.  Network-endian equivalent would work just
as fine; switch to it.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-by: Trond Myklebust <trond.myklebust@fys.uio.no>
Acked-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

3 files changed, 6 insertions, 5 deletions

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 63823945f972..0a7bbdc4a10a 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -177,7 +177,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open
 
         /* check seqid for replay. set nfs4_owner */
         status = nfsd4_process_open1(open);
-        if (status == NFSERR_REPLAY_ME) {
+        if (status == nfserr_replay_me) {
                 struct nfs4_replay *rp = &open->op_stateowner->so_replay;
                 fh_put(current_fh);
                 current_fh->fh_handle.fh_size = rp->rp_openfh_len;
@@ -188,7 +188,7 @@ nfsd4_open(struct svc_rqst *rqstp, struct svc_fh *current_fh, struct nfsd4_open
                         dprintk("nfsd4_open: replay failed"
                                 " restoring previous filehandle\n");
                 else
-                        status = NFSERR_REPLAY_ME;
+                        status = nfserr_replay_me;
         }
         if (status)
                 goto out;
@@ -937,7 +937,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp,
                 }
 
 encode_op:
-                if (op->status == NFSERR_REPLAY_ME) {
+                if (op->status == nfserr_replay_me) {
                         op->replay = &replay_owner->so_replay;
                         nfsd4_encode_replay(resp, op);
                         status = op->status = op->replay->rp_status;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index 2e468c9e64d9..293b6495829f 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1477,7 +1477,7 @@ nfsd4_process_open1(struct nfsd4_open *open)
         }
         if (open->op_seqid == sop->so_seqid - 1) {
                 if (sop->so_replay.rp_buflen)
-                        return NFSERR_REPLAY_ME;
+                        return nfserr_replay_me;
                 /* The original OPEN failed so spectacularly
                  * that we don't even have replay data saved!
                  * Therefore, we have no choice but to continue
@@ -2233,7 +2233,7 @@ check_replay:
         if (seqid == sop->so_seqid - 1) {
                 dprintk("NFSD: preprocess_seqid_op: retransmission?\n");
                 /* indicate replay to calling function */
-                return NFSERR_REPLAY_ME;
+                return nfserr_replay_me;
         }
         printk("NFSD: preprocess_seqid_op: bad seqid (expected %d, got %d)\n",
                         sop->so_seqid, seqid);
diff --git a/include/linux/nfsd/nfsd.h b/include/linux/nfsd/nfsd.h
index 68d29b66c6e2..eb231143d579 100644
--- a/include/linux/nfsd/nfsd.h
+++ b/include/linux/nfsd/nfsd.h
@@ -238,6 +238,7 @@ void		nfsd_lockd_shutdown(void);
 #define nfserr_badname          __constant_htonl(NFSERR_BADNAME)
 #define nfserr_cb_path_down     __constant_htonl(NFSERR_CB_PATH_DOWN)
 #define nfserr_locked           __constant_htonl(NFSERR_LOCKED)
+#define nfserr_replay_me        __constant_htonl(NFSERR_REPLAY_ME)
 
 /* error codes for internal use */
 /* if a request fails due to kmalloc failure, it gets dropped.