summaryrefslogtreecommitdiff
path: root/include/linux/lockd
diff options
context:
space:
mode:
authorTrond Myklebust <trond.myklebust@fys.uio.no>2004-03-13 11:47:36 -0500
committerTrond Myklebust <trond.myklebust@fys.uio.no>2004-03-13 11:47:36 -0500
commitd2ac640a44710081a4945f858894a190824343d3 (patch)
tree4f926b54ef6795f048c6a252a5a6f8323e8b4076 /include/linux/lockd
parent72cffe4f9165f382c4a274ac15ec3db27fae9318 (diff)
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.
Diffstat (limited to 'include/linux/lockd')
-rw-r--r--include/linux/lockd/debug.h2
1 files changed, 1 insertions, 1 deletions
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