From: Andy Adamson <andros@xxxxxxxxxx>
In preparation to remove struct nfsd4_cache_entry
Signed-off-by: Andy Adamson <andros@xxxxxxxxxx>
---
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 d237e62..05083d3 100644
--- a/fs/nfsd/nfs4state.c
+++ b/fs/nfsd/nfs4state.c
@@ -1081,7 +1081,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
@@ -1192,7 +1192,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 46aabb1..8800e18 100644
--- a/include/linux/nfsd/state.h
+++ b/include/linux/nfsd/state.h
@@ -128,6 +128,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
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
