From mboxrd@z Thu Jan 1 00:00:00 1970 From: andros@netapp.com Subject: [PATCH 15/30] nfsd41: obliterate nfsd4_copy_pages Date: Mon, 8 Jun 2009 14:20:56 -0400 Message-ID: <1244485271-7461-16-git-send-email-andros@netapp.com> References: <> <1244485271-7461-1-git-send-email-andros@netapp.com> <1244485271-7461-2-git-send-email-andros@netapp.com> <1244485271-7461-3-git-send-email-andros@netapp.com> <1244485271-7461-4-git-send-email-andros@netapp.com> <1244485271-7461-5-git-send-email-andros@netapp.com> <1244485271-7461-6-git-send-email-andros@netapp.com> <1244485271-7461-7-git-send-email-andros@netapp.com> <1244485271-7461-8-git-send-email-andros@netapp.com> <1244485271-7461-9-git-send-email-andros@netapp.com> <1244485271-7461-10-git-send-email-andros@netapp.com> <1244485271-7461-11-git-send-email-andros@netapp.com> <1244485271-7461-12-git-send-email-andros@netapp.com> <1244485271-7461-13-git-send-email-andros@netapp.com> <1244485271-7461-14-git-send-email-andros@netapp.com> <1244485271-7461-15-git-send-email-andros@netapp.com> Cc: linux-nfs@vger.kernel.org, Andy Adamson To: bfields@fieldses.org Return-path: Received: from mx2.netapp.com ([216.240.18.37]:38770 "EHLO mx2.netapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753328AbZFHSV2 (ORCPT ); Mon, 8 Jun 2009 14:21:28 -0400 In-Reply-To: <1244485271-7461-15-git-send-email-andros@netapp.com> Sender: linux-nfs-owner@vger.kernel.org List-ID: From: Andy Adamson Replacing page based drc cache with buffer based drc cache. Signed-off-by: Andy Adamson --- fs/nfsd/nfs4state.c | 21 --------------------- 1 files changed, 0 insertions(+), 21 deletions(-) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 45cca94..bc443ba 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -1022,19 +1022,6 @@ nfsd4_release_respages(struct page **respages, short resused) } } -static void -nfsd4_copy_pages(struct page **topages, struct page **frompages, short count) -{ - int i; - - for (i = 0; i < count; i++) { - topages[i] = frompages[i]; - if (!topages[i]) - continue; - get_page(topages[i]); - } -} - /* * Cache the reply pages up to NFSD_PAGES_PER_SLOT + 1, clearing the previous * pages. We add a page to NFSD_PAGES_PER_SLOT for the case where the total @@ -1087,8 +1074,6 @@ nfsd4_store_cache_entry(struct nfsd4_compoundres *resp) entry->ce_resused = rqstp->rq_resused; if (entry->ce_resused > NFSD_PAGES_PER_SLOT + 1) entry->ce_resused = NFSD_PAGES_PER_SLOT + 1; - nfsd4_copy_pages(entry->ce_respages, rqstp->rq_respages, - entry->ce_resused); entry->ce_datav.iov_base = resp->cstate.statp; entry->ce_datav.iov_len = resv->iov_len - ((char *)resp->cstate.statp - (char *)page_address(rqstp->rq_respages[0])); @@ -1161,17 +1146,11 @@ nfsd4_replay_cache_entry(struct nfsd4_compoundres *resp, * cached header. Release all the allocated result pages. */ svc_free_res_pages(resp->rqstp); - nfsd4_copy_pages(resp->rqstp->rq_respages, entry->ce_respages, - entry->ce_resused); } else { /* Release all but the first allocated result page */ resp->rqstp->rq_resused--; svc_free_res_pages(resp->rqstp); - - nfsd4_copy_pages(&resp->rqstp->rq_respages[1], - &entry->ce_respages[1], - entry->ce_resused - 1); } resp->rqstp->rq_resused = entry->ce_resused; -- 1.5.4.3