[PATCH 14/30] nfsd41: nfsd41: replace ce_status with nfsd4_slot field

andros
2009-06-08T18:21:27Z

In preparation to remove struct nfsd4_cache_entry

Signed-off-by: Andy Adamson <andros@netapp.com>
---
fs/nfsd/nfs4state.c | 4 ++--
include/linux/nfsd/state.h | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
index c5c372d..45cca94 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1063,7 +1063,7 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp)

nfsd4_release_respages(entry->ce_respages, entry->ce_resused);
slot->sl_opcnt = resp->opcnt;
- entry->ce_status = resp->cstate.status;
+ slot->sl_status = resp->cstate.status;

/*
* Don't need a page to cache just the sequence operation - the slot
@@ -1177,7 +1177,7 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp,
resp->rqstp->rq_resused = entry->ce_resused;
resp->opcnt = slot->sl_opcnt;
resp->cstate.iovlen = entry->ce_datav.iov_len + entry->ce_rpchdrlen;
- status = entry->ce_status;
+ status = slot->sl_status;

return status;
}
diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h
index ceee37a..65f8fb6 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -122,6 +122,7 @@ struct nfsd4_slot {
u32 sl_seqid;
int sl_cachethis;
int sl_opcnt;
+ __be32 sl_status;
u32 sl_datalen;
char sl_data[NFSD_SLOT_CACHE_SIZE];
struct nfsd4_cache_entry sl_cache_entry;
--
1.5.4.3