diff --git a/[refs] b/[refs]
index ff79a9c9cfda..6ade57d24369 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f34ec991ae0f015f5cdc51ad46c3a317ffae2466
+refs/heads/master: 099bd05f27ff24a3041d54e7ed42d2eb681484b9
diff --git a/trunk/fs/lockd/mon.c b/trunk/fs/lockd/mon.c
index 908b23fadd05..84fd84cb67b7 100644
--- a/trunk/fs/lockd/mon.c
+++ b/trunk/fs/lockd/mon.c
@@ -149,6 +149,15 @@ nsm_create(void)
  * XDR functions for NSM.
  */
 
+static __be32 *xdr_encode_nsm_string(__be32 *p, char *string)
+{
+	size_t len = strlen(string);
+
+	if (len > SM_MAXSTRLEN)
+		len = SM_MAXSTRLEN;
+	return xdr_encode_opaque(p, string, len);
+}
+
 static __be32 *
 xdr_encode_common(struct rpc_rqst *rqstp, __be32 *p, struct nsm_args *argp)
 {