From d2ac640a44710081a4945f858894a190824343d3 Mon Sep 17 00:00:00 2001 From: Trond Myklebust Date: Sat, 13 Mar 2004 11:47:36 -0500 Subject: NFSv2/v3/v4: Parenthesize #defines in nfs?xdr.c. Fix an off-by-one error on the value of compound_decode_hdr_maxsz. NFSv4: fix a printk() typo (spotted by Linda Dunaphant). NFSv4: Ensure that nfs4_open_reclaim() copies the value of the new stateid back into the shared nfsv4 state structure. NFSv4: Don't leak NFS4ERR_WRONGSEC errors back into nfs_lookup(). RPC,NFS,Lockd: Mark the debugging code as "unlikely" so that gcc moves it out of the mainline code paths. --- include/linux/lockd/debug.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/linux/lockd') diff --git a/include/linux/lockd/debug.h b/include/linux/lockd/debug.h index d494aeb6be74..5b6961d739d4 100644 --- a/include/linux/lockd/debug.h +++ b/include/linux/lockd/debug.h @@ -23,7 +23,7 @@ #undef ifdebug #if defined(RPC_DEBUG) && defined(LOCKD_DEBUG) -# define ifdebug(flag) if (nlm_debug & NLMDBG_##flag) +# define ifdebug(flag) if (unlikely(nlm_debug & NLMDBG_##flag)) #else # define ifdebug(flag) if (0) #endif -- cgit v1.2.3