From: Kinglong Mee <kinglongmee@gmail.com>
To: "J. Bruce Fields" <bfields@redhat.com>
Cc: "linux-nfs@vger.kernel.org" <linux-nfs@vger.kernel.org>,
Trond Myklebust <trond.myklebust@primarydata.com>,
kinglongmee@gmail.com
Subject: nfsd: supports read buffer from multiples pages
Date: Sun, 31 Jan 2016 20:50:10 +0800 [thread overview]
Message-ID: <56AE0302.6050101@gmail.com> (raw)
ltp fsync02 will cause nfs sending LAYOUTCOMMIT with length
larger than two pages. nfsd returns NFSERR_BAD_XDR right now.
This patch lets nfsd supports read buffer from multiples pages.
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
---
fs/nfsd/nfs4xdr.c | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index d6ef095..fcf399f 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -143,11 +143,11 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes)
* Maybe we need a new page, maybe we have just run out
*/
unsigned int avail = (char *)argp->end - (char *)argp->p;
+ unsigned int copied = 0;
__be32 *p;
+
if (avail + argp->pagelen < nbytes)
return NULL;
- if (avail + PAGE_SIZE < nbytes) /* need more than a page !! */
- return NULL;
/* ok, we can do it with the current plus the next page */
if (nbytes <= sizeof(argp->tmp))
p = argp->tmp;
@@ -164,9 +164,19 @@ static __be32 *read_buf(struct nfsd4_compoundargs *argp, u32 nbytes)
* guarantee p points to at least nbytes bytes.
*/
memcpy(p, argp->p, avail);
+ copied += avail;
+ nbytes -= avail;
+
+ while (nbytes > PAGE_SIZE) {
+ next_decode_page(argp);
+ memcpy(((char*)p) + copied, argp->p, PAGE_SIZE);
+ copied += PAGE_SIZE;
+ nbytes -= PAGE_SIZE;
+ }
+
next_decode_page(argp);
- memcpy(((char*)p)+avail, argp->p, (nbytes - avail));
- argp->p += XDR_QUADLEN(nbytes - avail);
+ memcpy(((char*)p) + copied, argp->p, nbytes);
+ argp->p += XDR_QUADLEN(nbytes);
return p;
}
--
2.5.0
next reply other threads:[~2016-01-31 12:50 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-31 12:50 Kinglong Mee [this message]
2016-02-01 18:38 ` nfsd: supports read buffer from multiples pages J. Bruce Fields
2016-02-01 18:48 ` J. Bruce Fields
2016-02-02 0:54 ` Kinglong Mee
2016-02-02 9:20 ` Christoph Hellwig
2016-02-02 14:29 ` J. Bruce Fields
2016-02-29 9:49 ` Christoph Hellwig
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=56AE0302.6050101@gmail.com \
--to=kinglongmee@gmail.com \
--cc=bfields@redhat.com \
--cc=linux-nfs@vger.kernel.org \
--cc=trond.myklebust@primarydata.com \
/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;
as well as URLs for NNTP newsgroup(s).