From 518e7c456813784fbcbd37ce1435f17e6ee92ad6 Mon Sep 17 00:00:00 2001
From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Wed, 14 Mar 2012 21:55:01 -0400
Subject: [PATCH] --- yaml --- r: 294561 b: refs/heads/master c:
 95a13f7b33be87d85d8e6652126a3f4d64d164db h: refs/heads/master i:   294559:
 09679a280cd7aea04c13ae58bdb28021d9674782 v: v3

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

diff --git a/[refs] b/[refs]
index 1cc06c5695d3..fb655a9a6c32 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 96dcadc2fdd111dca90d559f189a30c65394451a
+refs/heads/master: 95a13f7b33be87d85d8e6652126a3f4d64d164db
diff --git a/trunk/fs/nfs/nfs4xdr.c b/trunk/fs/nfs/nfs4xdr.c
index f7e064d997f6..c74fdb114b48 100644
--- a/trunk/fs/nfs/nfs4xdr.c
+++ b/trunk/fs/nfs/nfs4xdr.c
@@ -3440,7 +3440,7 @@ static int decode_pathname(struct xdr_stream *xdr, struct nfs4_pathname *path)
 		status = decode_opaque_inline(xdr, &component->len, &component->data);
 		if (unlikely(status != 0))
 			goto out_eio;
-		if (unlikely(nfs_debug & NFSDBG_XDR))
+		ifdebug (XDR)
 			pr_cont("%s%.*s ",
 				(path->ncomponents != n ? "/ " : ""),
 				component->len, component->data);