diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-10-20 02:29:03 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-20 13:26:43 -0400 |
commit | a90b061c0bf712961cea40d9c916b300073d12e5 (patch) | |
tree | 74514dbfc0e7814b983ad98bef55086539248d0a /fs/nfsd/nfs4proc.c | |
parent | c7afef1f963bec198b186cc34b9e8c9b9ce2e266 (diff) |
[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>
Diffstat (limited to 'fs/nfsd/nfs4proc.c')
-rw-r--r-- | 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 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 | |||
177 | 177 | ||
178 | /* check seqid for replay. set nfs4_owner */ | 178 | /* check seqid for replay. set nfs4_owner */ |
179 | status = nfsd4_process_open1(open); | 179 | status = nfsd4_process_open1(open); |
180 | if (status == NFSERR_REPLAY_ME) { | 180 | if (status == nfserr_replay_me) { |
181 | struct nfs4_replay *rp = &open->op_stateowner->so_replay; | 181 | struct nfs4_replay *rp = &open->op_stateowner->so_replay; |
182 | fh_put(current_fh); | 182 | fh_put(current_fh); |
183 | current_fh->fh_handle.fh_size = rp->rp_openfh_len; | 183 | 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 | |||
188 | dprintk("nfsd4_open: replay failed" | 188 | dprintk("nfsd4_open: replay failed" |
189 | " restoring previous filehandle\n"); | 189 | " restoring previous filehandle\n"); |
190 | else | 190 | else |
191 | status = NFSERR_REPLAY_ME; | 191 | status = nfserr_replay_me; |
192 | } | 192 | } |
193 | if (status) | 193 | if (status) |
194 | goto out; | 194 | goto out; |
@@ -937,7 +937,7 @@ nfsd4_proc_compound(struct svc_rqst *rqstp, | |||
937 | } | 937 | } |
938 | 938 | ||
939 | encode_op: | 939 | encode_op: |
940 | if (op->status == NFSERR_REPLAY_ME) { | 940 | if (op->status == nfserr_replay_me) { |
941 | op->replay = &replay_owner->so_replay; | 941 | op->replay = &replay_owner->so_replay; |
942 | nfsd4_encode_replay(resp, op); | 942 | nfsd4_encode_replay(resp, op); |
943 | status = op->status = op->replay->rp_status; | 943 | status = op->status = op->replay->rp_status; |