From: yury <yury>
Date: Fri, 19 Sep 2008 19:01:04 +0000 (+0000)
Subject: b=16777 16776
X-Git-Tag: v1_7_110~1^93
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=2463ab5cc5d5e2bf3b377d813578c189bce5c55a;p=fs%2Flustre-release.git

b=16777 16776
r=shadow, adilger, vitaly, robert

- new clas_hash and using it for connections, held locks on server, etc
---

diff --git a/lustre/include/linux/lustre_compat25.h b/lustre/include/linux/lustre_compat25.h
index 398bb3e..b69ac48 100644
--- a/lustre/include/linux/lustre_compat25.h
+++ b/lustre/include/linux/lustre_compat25.h
@@ -622,5 +622,10 @@ static inline long labs(long x)
 }
 #endif
 
+/* Using kernel fls(). Userspace will use one defined in user-bitops.h. */
+#ifndef __fls
+#define __fls fls
+#endif
+
 #endif /* __KERNEL__ */
 #endif /* _COMPAT25_H */