Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New tag 2.1.53
[fs/lustre-release.git]
/
lustre
/
include
/
lustre_lite.h
diff --git
a/lustre/include/lustre_lite.h
b/lustre/include/lustre_lite.h
index
f0c6495
..
7fa9937
100644
(file)
--- a/
lustre/include/lustre_lite.h
+++ b/
lustre/include/lustre_lite.h
@@
-26,7
+26,7
@@
* GPL HEADER END
*/
/*
* GPL HEADER END
*/
/*
- * Copyright
2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright
(c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
* Use is subject to license terms.
*/
/*
* Use is subject to license terms.
*/
/*
@@
-37,6
+37,11
@@
#ifndef _LL_H
#define _LL_H
#ifndef _LL_H
#define _LL_H
+/** \defgroup lite lite
+ *
+ * @{
+ */
+
#if defined(__linux__)
#include <linux/lustre_lite.h>
#elif defined(__APPLE__)
#if defined(__linux__)
#include <linux/lustre_lite.h>
#elif defined(__APPLE__)
@@
-124,8
+129,8
@@
struct lustre_client_ocd {
* mount is connected to. This field is updated by ll_ocd_update()
* under ->lco_lock.
*/
* mount is connected to. This field is updated by ll_ocd_update()
* under ->lco_lock.
*/
- __u64 lco_flags;
-
spinlock_t
lco_lock;
+ __u64
lco_flags;
+
cfs_semaphore_t
lco_lock;
struct obd_export *lco_md_exp;
struct obd_export *lco_dt_exp;
};
struct obd_export *lco_md_exp;
struct obd_export *lco_dt_exp;
};
@@
-145,8
+150,15
@@
static inline void ll_dir_chain_fini(struct ll_dir_chain *chain)
{
}
{
}
-static inline unsigned long hash_x_index(
unsigned long value
)
+static inline unsigned long hash_x_index(
__u64 hash, int hash64
)
{
{
- return ~0UL - value;
+#ifdef __KERNEL__
+ if (BITS_PER_LONG == 32 && hash64)
+ hash >>= 32;
+#endif
+ return ~0UL - hash;
}
}
+
+/** @} lite */
+
#endif
#endif