From b468bf97d9f900a23098d0b24a717daf1c4f9fbf Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Sun, 4 Mar 2012 18:13:56 -0500
Subject: [PATCH] --- yaml --- r: 294527 b: refs/heads/master c:
 cb17e556f6202c200d38a2e0c05a5bd29060389f h: refs/heads/master i:   294525:
 6d14c4f893824902c18528d1b6e59b5a74d04a84   294523:
 2a8cd0664cb274f0047c59eb4af1b2bb33b02869   294519:
 5c5640d0110353e6c261eb6e6ed14dd8204917fc   294511:
 da1523c11ca5d0cef0f14de12b338c89974463d4   294495:
 561aa9e4bb987b08ba29cc4ff3b8b258b16b1fab   294463:
 19990dd74efcb46bfeee8c11818a34df902bd24b   294399:
 54cbdc9ad2d57e0f084ff0f743c7bed0082cbd45 v: v3

---
 [refs]                 |  2 +-
 trunk/fs/nfs/nfs4xdr.c | 14 +++++++++-----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 9738343a9611..de67b1b33c3f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d0b496d2fc08cc51000fcdd9739235d1cab890cd
+refs/heads/master: cb17e556f6202c200d38a2e0c05a5bd29060389f
diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c
index af11e8b5d367..de4cb5cfc318 100644
--- a/trunk/fs/nfs/nfs4xdr.c
+++ b/trunk/fs/nfs/nfs4xdr.c
@@ -885,6 +885,14 @@ static __be32 *reserve_space(struct xdr_stream *xdr, size_t nbytes)
 	return p;
 }
 
+static void encode_opaque_fixed(struct xdr_stream *xdr, const void *buf, size_t len)
+{
+	__be32 *p;
+
+	p = xdr_reserve_space(xdr, len);
+	xdr_encode_opaque_fixed(p, buf, len);
+}
+
 static void encode_string(struct xdr_stream *xdr, unsigned int len, const char *str)
 {
 	__be32 *p;
@@ -922,11 +930,7 @@ static void encode_nops(struct compound_hdr *hdr)
 
 static void encode_nfs4_verifier(struct xdr_stream *xdr, const nfs4_verifier *verf)
 {
-	__be32 *p;
-
-	p = xdr_reserve_space(xdr, NFS4_VERIFIER_SIZE);
-	BUG_ON(p == NULL);
-	xdr_encode_opaque_fixed(p, verf->data, NFS4_VERIFIER_SIZE);
+	encode_opaque_fixed(xdr, verf->data, NFS4_VERIFIER_SIZE);
 }
 
 static void encode_attrs(struct xdr_stream *xdr, const struct iattr *iap, const struct nfs_server *server)