From: andros@netapp.com
To: bfields@fieldses.org
Cc: linux-nfs@vger.kernel.org, Andy Adamson <andros@netapp.com>
Subject: [PATCH 15/30] nfsd41: obliterate nfsd4_copy_pages
Date: Mon, 8 Jun 2009 14:20:56 -0400 [thread overview]
Message-ID: <1244485271-7461-16-git-send-email-andros@netapp.com> (raw)
In-Reply-To: <1244485271-7461-15-git-send-email-andros@netapp.com>
From: Andy Adamson <andros@netapp.com>
Replacing page based drc cache with buffer based drc cache.
Signed-off-by: Andy Adamson <andros@netapp.com>
---
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
next prev parent reply other threads:[~2009-06-08 18:21 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-08 18:20 [PATCH 0/30] NFSv4.1 Server DRC rewrite Version 3 andros
2009-06-08 18:20 ` [PATCH 01/30] nfsd41: create_session check replay first andros
2009-06-08 18:20 ` [PATCH 02/30] nfsd41: change check_slot_seqid parameters andros
2009-06-08 18:20 ` [PATCH 03/30] nfsd41: declare clientid create session slot structure andros
2009-06-08 18:20 ` [PATCH 04/30] nfsd41: encode create_session result into clid cache andros
2009-06-08 18:20 ` [PATCH 05/30] nfsd41: replay solo and embedded create session andros
2009-06-08 18:20 ` [PATCH 06/30] nfsd41 remove the unused nfsd4_slot create session slot andros
2009-06-08 18:20 ` [PATCH 07/30] nfsd41: sanity check client drc maxreqs andros
2009-06-08 18:20 ` [PATCH 08/30] nfsd41: change from page to memory based drc limits andros
2009-06-08 18:20 ` [PATCH 09/30] nfsd41: use globals for DRC memory use management andros
2009-06-08 18:20 ` [PATCH 10/30] nfsd41: set the session maximum response size cached andros
2009-06-08 18:20 ` [PATCH 11/30] nfsd41: use static buffers for sessions DRC andros
2009-06-08 18:20 ` [PATCH 12/30] nfsd41: replace ce_cachethis with nfsd4_slot field andros
2009-06-08 18:20 ` [PATCH 13/30] nfsd41: replace ce_opcnt " andros
2009-06-08 18:20 ` [PATCH 14/30] nfsd41: nfsd41: replace ce_status " andros
2009-06-08 18:20 ` andros [this message]
2009-06-08 18:20 ` [PATCH 16/30] nfsd41: obliterate nfsd41_copy_replay_data andros
2009-06-08 18:20 ` [PATCH 17/30] nfsd41: obliterate nfsd4_release_respages andros
2009-06-08 18:20 ` [PATCH 18/30] nfsd41: remove iovlen field from nfsd4_compound_state andros
2009-06-08 18:21 ` [PATCH 19/30] nfsd41: remove struct nfsd4_cache_entry andros
2009-06-08 18:21 ` [PATCH 20/30] nfsd41: obliterate nfsd4_set_statp andros
2009-06-08 18:21 ` [PATCH 21/30] nfsd41: rename nfsd4_enc_uncached_replay andros
2009-06-08 18:21 ` [PATCH 22/30] nfsd41: encode replay sequence from the slot values andros
2009-06-08 18:21 ` [PATCH 23/30] nfsd41: fix nfsd4_replay_cache_entry comments andros
2009-06-08 18:21 ` [PATCH 24/30] nfsd41: fix nfsd4_store_cache_entry comments andros
2009-06-08 18:21 ` [PATCH 25/30] nfsd41: support 16 slots per session andros
2009-06-08 18:21 ` [PATCH 26/30] nfsd41: use the maximum operations per compound in nfsd4_compoundargs andros
2009-06-08 18:21 ` [PATCH 27/30] nfsd41: fix nfsd4_store_cache_entry dprintk andros
2009-06-08 18:21 ` [PATCH 28/30] nfsd41: add test for failed sequence operation andros
2009-06-08 18:21 ` [PATCH 29/30] nfsd41: remove redundant failed sequence check andros
2009-06-08 18:21 ` [PATCH 30/30] nfsd41: only reference the session on non-replay sequence andros
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1244485271-7461-16-git-send-email-andros@netapp.com \
--to=andros@netapp.com \
--cc=bfields@fieldses.org \
--cc=linux-nfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox