From: Chuck Lever <chuck.lever@oracle.com>
To: linux-nfs@vger.kernel.org
Subject: [PATCH v1 14/29] lockd: Update the NLMv1 TEST results encoder to use struct xdr_stream
Date: Mon, 03 May 2021 11:24:13 -0400 [thread overview]
Message-ID: <162005545388.23028.16261395929299651470.stgit@klimt.1015granger.net> (raw)
In-Reply-To: <162005520101.23028.15766816408658851498.stgit@klimt.1015granger.net>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
---
fs/lockd/xdr.c | 74 ++++++++++++++++++++++++++------------------------------
1 file changed, 35 insertions(+), 39 deletions(-)
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 840fa8ff8426..daf3524040d6 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -80,15 +80,6 @@ svcxdr_decode_fhandle(struct xdr_stream *xdr, struct nfs_fh *fh)
return true;
}
-/*
- * Encode and decode owner handle
- */
-static inline __be32 *
-nlm_encode_oh(__be32 *p, struct xdr_netobj *oh)
-{
- return xdr_encode_netobj(p, oh);
-}
-
static bool
svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)
{
@@ -121,39 +112,44 @@ svcxdr_decode_lock(struct xdr_stream *xdr, struct nlm_lock *lock)
return true;
}
-/*
- * Encode result of a TEST/TEST_MSG call
- */
-static __be32 *
-nlm_encode_testres(__be32 *p, struct nlm_res *resp)
+static bool
+svcxdr_encode_holder(struct xdr_stream *xdr, const struct nlm_lock *lock)
{
- s32 start, len;
-
- if (!(p = nlm_encode_cookie(p, &resp->cookie)))
- return NULL;
- *p++ = resp->status;
+ const struct file_lock *fl = &lock->fl;
+ s32 start, len;
- if (resp->status == nlm_lck_denied) {
- struct file_lock *fl = &resp->lock.fl;
-
- *p++ = (fl->fl_type == F_RDLCK)? xdr_zero : xdr_one;
- *p++ = htonl(resp->lock.svid);
-
- /* Encode owner handle. */
- if (!(p = xdr_encode_netobj(p, &resp->lock.oh)))
- return NULL;
+ /* exclusive */
+ if (xdr_stream_encode_bool(xdr, fl->fl_type != F_RDLCK) < 0)
+ return false;
+ if (xdr_stream_encode_u32(xdr, lock->svid) < 0)
+ return false;
+ if (!svcxdr_encode_owner(xdr, &lock->oh))
+ return false;
+ start = loff_t_to_s32(fl->fl_start);
+ if (fl->fl_end == OFFSET_MAX)
+ len = 0;
+ else
+ len = loff_t_to_s32(fl->fl_end - fl->fl_start + 1);
+ if (xdr_stream_encode_u32(xdr, start) < 0)
+ return false;
+ if (xdr_stream_encode_u32(xdr, len) < 0)
+ return false;
- start = loff_t_to_s32(fl->fl_start);
- if (fl->fl_end == OFFSET_MAX)
- len = 0;
- else
- len = loff_t_to_s32(fl->fl_end - fl->fl_start + 1);
+ return true;
+}
- *p++ = htonl(start);
- *p++ = htonl(len);
+static bool
+svcxdr_encode_testrply(struct xdr_stream *xdr, const struct nlm_res *resp)
+{
+ if (!svcxdr_encode_stats(xdr, resp->status))
+ return false;
+ switch (resp->status) {
+ case nlm_lck_denied:
+ if (!svcxdr_encode_holder(xdr, &resp->lock))
+ return false;
}
- return p;
+ return true;
}
@@ -345,11 +341,11 @@ nlmsvc_encode_void(struct svc_rqst *rqstp, __be32 *p)
int
nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
{
+ struct xdr_stream *xdr = &rqstp->rq_res_stream;
struct nlm_res *resp = rqstp->rq_resp;
- if (!(p = nlm_encode_testres(p, resp)))
- return 0;
- return xdr_ressize_check(rqstp, p);
+ return svcxdr_encode_cookie(xdr, &resp->cookie) &&
+ svcxdr_encode_testrply(xdr, resp);
}
int
next prev parent reply other threads:[~2021-05-03 15:24 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 15:22 [PATCH v1 00/29] server-side lockd XDR overhaul Chuck Lever
2021-05-03 15:22 ` [PATCH v1 01/29] lockd: Remove stale comments Chuck Lever
2021-05-03 15:22 ` [PATCH v1 02/29] lockd: Create a simplified .vs_dispatch method for NLM requests Chuck Lever
2021-05-03 15:23 ` [PATCH v1 03/29] lockd: Common NLM XDR helpers Chuck Lever
2021-05-03 15:23 ` [PATCH v1 04/29] lockd: Update the NLMv1 void argument decoder to use struct xdr_stream Chuck Lever
2021-05-03 15:23 ` [PATCH v1 05/29] lockd: Update the NLMv1 TEST arguments " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 06/29] lockd: Update the NLMv1 LOCK " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 07/29] lockd: Update the NLMv1 CANCEL " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 08/29] lockd: Update the NLMv1 UNLOCK " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 09/29] lockd: Update the NLMv1 nlm_res " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 10/29] lockd: Update the NLMv1 SM_NOTIFY " Chuck Lever
2021-05-03 15:23 ` [PATCH v1 11/29] lockd: Update the NLMv1 SHARE " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 12/29] lockd: Update the NLMv1 FREE_ALL " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 13/29] lockd: Update the NLMv1 void results encoder " Chuck Lever
2021-05-03 15:24 ` Chuck Lever [this message]
2021-05-03 15:24 ` [PATCH v1 15/29] lockd: Update the NLMv1 nlm_res " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 16/29] lockd: Update the NLMv1 SHARE " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 17/29] lockd: Update the NLMv4 void arguments decoder " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 18/29] lockd: Update the NLMv4 TEST " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 19/29] lockd: Update the NLMv4 LOCK " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 20/29] lockd: Update the NLMv4 CANCEL " Chuck Lever
2021-05-03 15:24 ` [PATCH v1 21/29] lockd: Update the NLMv4 UNLOCK " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 22/29] lockd: Update the NLMv4 nlm_res " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 23/29] lockd: Update the NLMv4 SM_NOTIFY " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 24/29] lockd: Update the NLMv4 SHARE " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 25/29] lockd: Update the NLMv4 FREE_ALL " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 26/29] lockd: Update the NLMv4 void results encoder " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 27/29] lockd: Update the NLMv4 TEST " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 28/29] lockd: Update the NLMv4 nlm_res " Chuck Lever
2021-05-03 15:25 ` [PATCH v1 29/29] lockd: Update the NLMv4 SHARE " Chuck Lever
2021-05-03 17:59 ` [PATCH v1 00/29] server-side lockd XDR overhaul J. Bruce Fields
2021-05-03 18:02 ` Chuck Lever III
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=162005545388.23028.16261395929299651470.stgit@klimt.1015granger.net \
--to=chuck.lever@oracle.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;
as well as URLs for NNTP newsgroup(s).