From: Anna Schumaker <Anna.Schumaker@netapp.com>
To: <Trond.Myklebust@primarydata.com>, <linux-nfs@vger.kernel.org>
Subject: [PATCH v2 4/6] NFS: Add READ_PLUS support for hole segments
Date: Wed, 28 Jan 2015 15:43:48 -0500 [thread overview]
Message-ID: <1422477830-28090-5-git-send-email-Anna.Schumaker@Netapp.com> (raw)
In-Reply-To: <1422477830-28090-1-git-send-email-Anna.Schumaker@Netapp.com>
This patch adds support for decoding a single hole segment returned by
the server.
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
---
fs/nfs/nfs42xdr.c | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/fs/nfs/nfs42xdr.c b/fs/nfs/nfs42xdr.c
index 3d7c01b..17126e8 100644
--- a/fs/nfs/nfs42xdr.c
+++ b/fs/nfs/nfs42xdr.c
@@ -212,6 +212,30 @@ out_overflow:
return -EIO;
}
+static int decode_read_plus_hole(struct xdr_stream *xdr, struct nfs_pgio_res *res)
+{
+ __be32 *p;
+ uint64_t offset, length;
+ size_t recvd;
+
+ p = xdr_inline_decode(xdr, 8 + 8);
+ if (unlikely(!p))
+ goto out_overflow;
+
+ p = xdr_decode_hyper(p, &offset);
+ p = xdr_decode_hyper(p, &length);
+
+ recvd = xdr_expand_hole(xdr, 0, length);
+ if (recvd < length)
+ res->eof = 0;
+
+ res->count = recvd;
+ return 0;
+out_overflow:
+ print_overflow_msg(__func__, xdr);
+ return -EIO;
+}
+
static int decode_read_plus(struct xdr_stream *xdr, struct nfs_pgio_res *res)
{
__be32 *p;
@@ -240,7 +264,7 @@ static int decode_read_plus(struct xdr_stream *xdr, struct nfs_pgio_res *res)
if (type == NFS4_CONTENT_DATA)
status = decode_read_plus_data(xdr, res);
else
- status = -ENOTSUPP;
+ status = decode_read_plus_hole(xdr, res);
if (segments > 1)
res->eof = 0;
--
2.2.2
next prev parent reply other threads:[~2015-01-28 20:44 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-01-28 20:43 [PATCH v2 0/6] NFS: Add READ_PLUS support Anna Schumaker
2015-01-28 20:43 ` [PATCH v2 1/6] NFS: Add READ_PLUS support for data segments Anna Schumaker
2015-02-05 14:10 ` Christoph Hellwig
2015-02-05 16:06 ` Anna Schumaker
2015-01-28 20:43 ` [PATCH v2 2/6] SUNRPC: Split out a function for setting current page Anna Schumaker
2015-01-28 20:43 ` [PATCH v2 3/6] SUNRPC: Add the ability to expand holes in data pages Anna Schumaker
2015-01-28 20:43 ` Anna Schumaker [this message]
2015-01-28 20:43 ` [PATCH v2 5/6] SUNRPC: Add the ability to shift data to a specific offset Anna Schumaker
2015-01-28 20:43 ` [PATCH v2 6/6] NFS: Add support for decoding multiple segments Anna Schumaker
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=1422477830-28090-5-git-send-email-Anna.Schumaker@Netapp.com \
--to=anna.schumaker@netapp.com \
--cc=Trond.Myklebust@primarydata.com \
--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