From: Trond Myklebust <Trond.Myklebust@netapp.com>
Date: Thu, 15 Mar 2012 01:55:01 +0000 (-0400)
Subject: NFS: Fix a compile error when !defined NFS_DEBUG
X-Git-Tag: v3.4-rc1~123^2~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95a13f7b33be87d85d8e6652126a3f4d64d164db;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

NFS: Fix a compile error when !defined NFS_DEBUG

We should use the 'ifdebug' wrapper rather than trying to inline
tests of nfs_debug, so that the code compiles correctly when we
don't define NFS_DEBUG.

Reported-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
---

diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c
index f7e064d..c74fdb1 100644
--- a/fs/nfs/nfs4xdr.c
+++ b/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);