From: andros@netapp.com Subject: [PATCH 13/31] nfsd41: replace ce_cachethis with nfsd4_slot field Date: Tue, 28 Apr 2009 12:59:47 -0400 Message-ID: <1240938005-23778-13-git-send-email-andros@netapp.com> References: <1240938005-23778-1-git-send-email-andros@netapp.com> <1240938005-23778-2-git-send-email-andros@netapp.com> <1240938005-23778-3-git-send-email-andros@netapp.com> <1240938005-23778-4-git-send-email-andros@netapp.com> <1240938005-23778-5-git-send-email-andros@netapp.com> <1240938005-23778-6-git-send-email-andros@netapp.com> <1240938005-23778-7-git-send-email-andros@netapp.com> <1240938005-23778-8-git-send-email-andros@netapp.com> <1240938005-23778-9-git-send-email-andros@netapp.com> <1240938005-23778-10-git-send-email-andros@netapp.com> <1240938005-23778-11-git-send-email-andros@netapp.com> <1240938005-23778-12-git-send-email-andros@netapp.com> Cc: pnfs@linux-nfs.org, linux-nfs@vger.kernel.org, Andy Adamson To: bfields@fieldses.org Return-path: Received: from mx2.netapp.com ([216.240.18.37]:50875 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760280AbZD1RAx (ORCPT ); Tue, 28 Apr 2009 13:00:53 -0400 In-Reply-To: <1240938005-23778-12-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andy Adamson In preparation to remove struct nfsd4_cache_entry Signed-off-by: Andy Adamson --- fs/nfsd/nfs4proc.c | 6 +++--- fs/nfsd/nfs4state.c | 10 +++++----- fs/nfsd/nfs4xdr.c | 2 +- include/linux/nfsd/state.h | 1 + include/linux/nfsd/xdr4.h | 2 +- 5 files changed, 11 insertions(+), 10 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 32d5866..d4c09a9 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -870,8 +870,8 @@ nfsd4_enc_uncached_replay(struct nfsd4_compoundargs *args, { struct nfsd4_op *op; - dprintk("--> %s resp->opcnt %d ce_cachethis %u \n", __func__, - resp->opcnt, resp->cstate.slot->sl_cache_entry.ce_cachethis); + dprintk("--> %s resp->opcnt %d cachethis %u \n", __func__, + resp->opcnt, resp->cstate.slot->sl_cachethis); /* Encode the replayed sequence operation */ BUG_ON(resp->opcnt != 1); @@ -879,7 +879,7 @@ nfsd4_enc_uncached_replay(struct nfsd4_compoundargs *args, nfsd4_encode_operation(resp, op); /*return nfserr_retry_uncached_rep in next operation. */ - if (resp->cstate.slot->sl_cache_entry.ce_cachethis == 0) { + if (resp->cstate.slot->sl_cachethis == 0) { op = &args->ops[resp->opcnt++]; op->status = nfserr_retry_uncached_rep; nfsd4_encode_operation(resp, op); diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fecee33..ae1f316 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1092,8 +1092,8 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp) entry->ce_resused = 0; entry->ce_rpchdrlen = 0; slot->sl_datalen = 0; - dprintk("%s Just cache SEQUENCE. ce_cachethis %d\n", __func__, - resp->cstate.slot->sl_cache_entry.ce_cachethis); + dprintk("%s Just cache SEQUENCE. cachethis %d\n", __func__, + resp->cstate.slot->sl_cachethis); return; } slot->sl_datalen = (char *)resp->p - (char *)resp->cstate.datap; @@ -1531,10 +1531,10 @@ nfsd4_sequence(struct svc_rqst *rqstp, /* Success! bump slot seqid */ slot->sl_inuse = true; slot->sl_seqid = seq->seqid; - slot->sl_cache_entry.ce_cachethis = seq->cachethis; - /* Always set the cache entry cachethis for solo sequence */ + slot->sl_cachethis = seq->cachethis; + /* Always set the slot cachethis for solo sequence */ if (nfsd4_is_solo_sequence(resp)) - slot->sl_cache_entry.ce_cachethis = 1; + slot->sl_cachethis = 1; cstate->slot = slot; cstate->session = session; diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 41ac385..827f6d4 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3214,7 +3214,7 @@ static int nfsd4_check_drc_limit(struct nfsd4_compoundres *resp) return status; session = resp->cstate.session; - if (session == NULL || slot->sl_cache_entry.ce_cachethis == 0) + if (session == NULL || slot->sl_cachethis == 0) return status; if (resp->opcnt >= args->opcnt) diff --git a/include/linux/nfsd/state.h b/include/linux/nfsd/state.h index 362c684..76e456c 100644 --- a/include/linux/nfsd/state.h +++ b/include/linux/nfsd/state.h @@ -126,6 +126,7 @@ struct nfsd4_cache_entry { struct nfsd4_slot { bool sl_inuse; u32 sl_seqid; + int sl_cachethis; u32 sl_datalen; char sl_data[NFSD_SLOT_CACHE_SIZE]; struct nfsd4_cache_entry sl_cache_entry; diff --git a/include/linux/nfsd/xdr4.h b/include/linux/nfsd/xdr4.h index 52589ba..faf5f2e 100644 --- a/include/linux/nfsd/xdr4.h +++ b/include/linux/nfsd/xdr4.h @@ -482,7 +482,7 @@ static inline bool nfsd4_is_solo_sequence(struct nfsd4_compoundres *resp) static inline bool nfsd4_not_cached(struct nfsd4_compoundres *resp) { - return !resp->cstate.slot->sl_cache_entry.ce_cachethis || + return !resp->cstate.slot->sl_cachethis || nfsd4_is_solo_sequence(resp); } -- 1.5.4.3