From 42deea6ea961edc52e3716b4cceeb6deedb198fc Mon Sep 17 00:00:00 2001
From: Chuck Lever <chuck.lever@oracle.com>
Date: Fri, 14 Mar 2008 14:25:53 -0400
Subject: [PATCH] --- yaml --- r: 92902 b: refs/heads/master c:
 ea72a7f170e686baf00ceee57b6197bef686889c h: refs/heads/master v: v3

---
 [refs]               |  2 +-
 trunk/fs/lockd/mon.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 22b11b0612a0..61af08b90037 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 850c95fd07b63704d06909c9a081c51272d32db1
+refs/heads/master: ea72a7f170e686baf00ceee57b6197bef686889c
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index 06216d6715f7..3935d7b604f5 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -202,6 +202,19 @@ static __be32 *xdr_encode_my_id(__be32 *p, struct nsm_args *argp)
 	return p;
 }
 
+/*
+ * The "mon_id" argument specifies the non-private arguments
+ * of an SM_MON or SM_UNMON call.
+ */
+static __be32 *xdr_encode_mon_id(__be32 *p, struct nsm_args *argp)
+{
+	p = xdr_encode_mon_name(p, argp);
+	if (!p)
+		return ERR_PTR(-EIO);
+
+	return xdr_encode_my_id(p, argp);
+}
+
 static __be32 *
 xdr_encode_common(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp)
 {