Skip to content
Snippets Groups Projects
Commit cb84e877 authored by Yury Umanets's avatar Yury Umanets
Browse files

b=16776 

r=shadow

- final part of 16776 being already landed to 1.6.x after shadow's inspection.
parent d4a93738
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
libcfs/include/libcfs/user-bitops.h
+ 40
− 0
View file @ cb84e877
...@@ -72,6 +72,45 @@ static __inline__ int test_bit(int nr, const unsigned long *addr) ...@@ -72,6 +72,45 @@ static __inline__ int test_bit(int nr, const unsigned long *addr)
} }
/* using binary seach */ /* using binary seach */
static __inline__ unsigned long __fls(long data)
{
int pos = 32;
if (!data)
return 0;
#if BITS_PER_LONG == 64
pos += 32;
if ((data & 0xFFFFFFFF) == 0) {
data <<= 32;
pos -= 32;
}
#endif
if (!(data & 0xFFFF0000u)) {
data <<= 16;
pos -= 16;
}
if (!(data & 0xFF000000u)) {
data <<= 8;
pos -= 8;
}
if (!(data & 0xF0000000u)) {
data <<= 4;
pos -= 4;
}
if (!(data & 0xC0000000u)) {
data <<= 2;
pos -= 2;
}
if (!(data & 0x80000000u)) {
data <<= 1;
pos -= 1;
}
return pos;
}
static __inline__ unsigned long __ffs(long data) static __inline__ unsigned long __ffs(long data)
{ {
int pos = 0; int pos = 0;
...@@ -105,6 +144,7 @@ static __inline__ unsigned long __ffs(long data) ...@@ -105,6 +144,7 @@ static __inline__ unsigned long __ffs(long data)
} }
#define __ffz(x) __ffs(~(x)) #define __ffz(x) __ffs(~(x))
#define __flz(x) __fls(~(x))
unsigned long find_next_bit(unsigned long *addr, unsigned long find_next_bit(unsigned long *addr,
unsigned long size, unsigned long offset); unsigned long size, unsigned long offset);
......
lustre/include/class_hash.h
+ 48
− 95
View file @ cb84e877
...@@ -40,75 +40,28 @@ ...@@ -40,75 +40,28 @@
#include <lustre_lib.h> #include <lustre_lib.h>
struct lustre_hash_ops; struct lustre_hash_ops;
typedef struct lustre_hash_bucket { typedef struct lustre_hash_bucket {
/** struct hlist_head lhb_head; /* entries list */
* Entries list. atomic_t lhb_count; /* current entries */
*/ rwlock_t lhb_rwlock; /* lustre_hash_bucket */
struct hlist_head lhb_head;
/**
* Current entries.
*/
atomic_t lhb_count;
/**
* Lustre_hash_bucket.
*/
rwlock_t lhb_rwlock;
} lustre_hash_bucket_t; } lustre_hash_bucket_t;
#define LUSTRE_MAX_HASH_NAME 16
typedef struct lustre_hash { typedef struct lustre_hash {
/** int lh_cur_size; /* current hash size */
* Hash name. int lh_min_size; /* min hash size */
*/ int lh_max_size; /* max hash size */
char *lh_name; int lh_min_theta; /* resize min threshold */
/** int lh_max_theta; /* resize max threshold */
* Hash name size. int lh_flags; /* hash flags */
*/ atomic_t lh_count; /* current entries */
unsigned int lh_name_size; atomic_t lh_rehash_count;/* resize count */
/** struct lustre_hash_bucket *lh_buckets; /* hash buckets */
* Current hash size. struct lustre_hash_ops *lh_ops; /* hash operations */
*/ rwlock_t lh_rwlock; /* lustre_hash */
unsigned int lh_cur_size; char lh_name[LUSTRE_MAX_HASH_NAME];
/**
* Min hash size.
*/
unsigned int lh_min_size;
/**
* Max hash size.
*/
unsigned int lh_max_size;
/**
* Resize min threshold.
*/
unsigned int lh_min_theta;
/**
* Resize max threshold.
*/
unsigned int lh_max_theta;
/**
* Hash flags.
*/
int lh_flags;
/**
* Current entries.
*/
atomic_t lh_count;
/**
* Resize count.
*/
atomic_t lh_rehash_count;
/**
* Hash buckets.
*/
struct lustre_hash_bucket *lh_buckets;
/**
* Hash operations.
*/
struct lustre_hash_ops *lh_ops;
/**
* Protects lustre_hash.
*/
rwlock_t lh_rwlock;
} lustre_hash_t; } lustre_hash_t;
typedef struct lustre_hash_ops { typedef struct lustre_hash_ops {
...@@ -120,14 +73,8 @@ typedef struct lustre_hash_ops { ...@@ -120,14 +73,8 @@ typedef struct lustre_hash_ops {
void (*lh_exit)(struct hlist_node *hnode); void (*lh_exit)(struct hlist_node *hnode);
} lustre_hash_ops_t; } lustre_hash_ops_t;
/** #define LH_DEBUG 0x0001 /* Enable expensive debug checks */
* Enable expensive debug checks. #define LH_REHASH 0x0002 /* Enable dynamic hash resizing */
*/
#define LH_DEBUG 0x0001
/**
* Enable dynamic hash resizing.
*/
#define LH_REHASH 0x0002
#define LHO(lh) (lh)->lh_ops #define LHO(lh) (lh)->lh_ops
#define LHP(lh, op) (lh)->lh_ops->lh_ ## op #define LHP(lh, op) (lh)->lh_ops->lh_ ## op
...@@ -136,8 +83,9 @@ static inline unsigned ...@@ -136,8 +83,9 @@ static inline unsigned
lh_hash(lustre_hash_t *lh, void *key, unsigned mask) lh_hash(lustre_hash_t *lh, void *key, unsigned mask)
{ {
LASSERT(lh); LASSERT(lh);
LASSERT(LHO(lh));
if (LHO(lh) && LHP(lh, hash)) if (LHP(lh, hash))
return LHP(lh, hash)(lh, key, mask); return LHP(lh, hash)(lh, key, mask);
return -EOPNOTSUPP; return -EOPNOTSUPP;
...@@ -148,14 +96,15 @@ lh_key(lustre_hash_t *lh, struct hlist_node *hnode) ...@@ -148,14 +96,15 @@ lh_key(lustre_hash_t *lh, struct hlist_node *hnode)
{ {
LASSERT(lh); LASSERT(lh);
LASSERT(hnode); LASSERT(hnode);
LASSERT(LHO(lh));
if (LHO(lh) && LHP(lh, key)) if (LHP(lh, key))
return LHP(lh, key)(hnode); return LHP(lh, key)(hnode);
return NULL; return NULL;
} }
/** /**
* Returns 1 on a match, * Returns 1 on a match,
* XXX: This would be better if it returned, -1, 0, or 1 for * XXX: This would be better if it returned, -1, 0, or 1 for
* <, =, > respectivly. It could then be used to implement * <, =, > respectivly. It could then be used to implement
...@@ -170,8 +119,9 @@ lh_compare(lustre_hash_t *lh, void *key, struct hlist_node *hnode) ...@@ -170,8 +119,9 @@ lh_compare(lustre_hash_t *lh, void *key, struct hlist_node *hnode)
{ {
LASSERT(lh); LASSERT(lh);
LASSERT(hnode); LASSERT(hnode);
LASSERT(LHO(lh));
if (LHO(lh) && LHP(lh, compare)) if (LHP(lh, compare))
return LHP(lh, compare)(key, hnode); return LHP(lh, compare)(key, hnode);
return -EOPNOTSUPP; return -EOPNOTSUPP;
...@@ -182,8 +132,9 @@ lh_get(lustre_hash_t *lh, struct hlist_node *hnode) ...@@ -182,8 +132,9 @@ lh_get(lustre_hash_t *lh, struct hlist_node *hnode)
{ {
LASSERT(lh); LASSERT(lh);
LASSERT(hnode); LASSERT(hnode);
LASSERT(LHO(lh));
if (LHO(lh) && LHP(lh, get)) if (LHP(lh, get))
return LHP(lh, get)(hnode); return LHP(lh, get)(hnode);
return NULL; return NULL;
...@@ -194,8 +145,9 @@ lh_put(lustre_hash_t *lh, struct hlist_node *hnode) ...@@ -194,8 +145,9 @@ lh_put(lustre_hash_t *lh, struct hlist_node *hnode)
{ {
LASSERT(lh); LASSERT(lh);
LASSERT(hnode); LASSERT(hnode);
LASSERT(LHO(lh));
if (LHO(lh) && LHP(lh, put)) if (LHP(lh, put))
return LHP(lh, put)(hnode); return LHP(lh, put)(hnode);
return NULL; return NULL;
...@@ -206,8 +158,9 @@ lh_exit(lustre_hash_t *lh, struct hlist_node *hnode) ...@@ -206,8 +158,9 @@ lh_exit(lustre_hash_t *lh, struct hlist_node *hnode)
{ {
LASSERT(lh); LASSERT(lh);
LASSERT(hnode); LASSERT(hnode);
LASSERT(LHO(lh));
if (LHO(lh) && LHP(lh, exit)) if (LHP(lh, exit))
return LHP(lh, exit)(hnode); return LHP(lh, exit)(hnode);
} }
...@@ -222,7 +175,7 @@ __lustre_hash_key_validate(lustre_hash_t *lh, void *key, ...@@ -222,7 +175,7 @@ __lustre_hash_key_validate(lustre_hash_t *lh, void *key,
LASSERT(lh_compare(lh, key, hnode)); LASSERT(lh_compare(lh, key, hnode));
} }
/* /**
* Validate hnode is in the correct bucket. * Validate hnode is in the correct bucket.
*/ */
static inline void static inline void
...@@ -234,9 +187,9 @@ __lustre_hash_bucket_validate(lustre_hash_t *lh, lustre_hash_bucket_t *lhb, ...@@ -234,9 +187,9 @@ __lustre_hash_bucket_validate(lustre_hash_t *lh, lustre_hash_bucket_t *lhb,
if (unlikely(lh->lh_flags & LH_DEBUG)) { if (unlikely(lh->lh_flags & LH_DEBUG)) {
i = lh_hash(lh, lh_key(lh, hnode), lh->lh_cur_size - 1); i = lh_hash(lh, lh_key(lh, hnode), lh->lh_cur_size - 1);
LASSERT(&lh->lh_buckets[i] == lhb); LASSERT(&lh->lh_buckets[i] == lhb);
} }
} }
static inline struct hlist_node * static inline struct hlist_node *
__lustre_hash_bucket_lookup(lustre_hash_t *lh, __lustre_hash_bucket_lookup(lustre_hash_t *lh,
lustre_hash_bucket_t *lhb, void *key) lustre_hash_bucket_t *lhb, void *key)
...@@ -268,7 +221,9 @@ __lustre_hash_bucket_del(lustre_hash_t *lh, ...@@ -268,7 +221,9 @@ __lustre_hash_bucket_del(lustre_hash_t *lh,
struct hlist_node *hnode) struct hlist_node *hnode)
{ {
hlist_del_init(hnode); hlist_del_init(hnode);
LASSERT(atomic_read(&lhb->lhb_count) > 0);
atomic_dec(&lhb->lhb_count); atomic_dec(&lhb->lhb_count);
LASSERT(atomic_read(&lh->lh_count) > 0);
atomic_dec(&lh->lh_count); atomic_dec(&lh->lh_count);
return lh_put(lh, hnode); return lh_put(lh, hnode);
...@@ -293,7 +248,7 @@ void *lustre_hash_findadd_unique(lustre_hash_t *lh, void *key, ...@@ -293,7 +248,7 @@ void *lustre_hash_findadd_unique(lustre_hash_t *lh, void *key,
struct hlist_node *hnode); struct hlist_node *hnode);
/* /*
* Hash deletion functions. * Hash deletion functions.
*/ */
void *lustre_hash_del(lustre_hash_t *lh, void *key, struct hlist_node *hnode); void *lustre_hash_del(lustre_hash_t *lh, void *key, struct hlist_node *hnode);
void *lustre_hash_del_key(lustre_hash_t *lh, void *key); void *lustre_hash_del_key(lustre_hash_t *lh, void *key);
...@@ -310,7 +265,7 @@ void lustre_hash_for_each_key(lustre_hash_t *lh, void *key, ...@@ -310,7 +265,7 @@ void lustre_hash_for_each_key(lustre_hash_t *lh, void *key,
lh_for_each_cb, void *data); lh_for_each_cb, void *data);
/* /*
* Rehash - theta is calculated to be the average chained * Rehash - Theta is calculated to be the average chained
* hash depth assuming a perfectly uniform hash funcion. * hash depth assuming a perfectly uniform hash funcion.
*/ */
int lustre_hash_rehash(lustre_hash_t *lh, int size); int lustre_hash_rehash(lustre_hash_t *lh, int size);
...@@ -338,16 +293,14 @@ __lustre_hash_set_theta(lustre_hash_t *lh, int min, int max) ...@@ -338,16 +293,14 @@ __lustre_hash_set_theta(lustre_hash_t *lh, int min, int max)
int lustre_hash_debug_header(char *str, int size); int lustre_hash_debug_header(char *str, int size);
int lustre_hash_debug_str(lustre_hash_t *lh, char *str, int size); int lustre_hash_debug_str(lustre_hash_t *lh, char *str, int size);
/*
/**
* 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1 * 2^31 + 2^29 - 2^25 + 2^22 - 2^19 - 2^16 + 1
*/ */
#define GOLDEN_RATIO_PRIME_32 0x9e370001UL #define CFS_GOLDEN_RATIO_PRIME_32 0x9e370001UL
/** /*
* 2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1 * 2^63 + 2^61 - 2^57 + 2^54 - 2^51 - 2^18 + 1
*/ */
#define GOLDEN_RATIO_PRIME_64 0x9e37fffffffc0001ULL #define CFS_GOLDEN_RATIO_PRIME_64 0x9e37fffffffc0001ULL
/** /**
* Generic djb2 hash algorithm for character arrays. * Generic djb2 hash algorithm for character arrays.
...@@ -362,7 +315,7 @@ lh_djb2_hash(void *key, size_t size, unsigned mask) ...@@ -362,7 +315,7 @@ lh_djb2_hash(void *key, size_t size, unsigned mask)
for (i = 0; i < size; i++) for (i = 0; i < size; i++)
hash = hash * 33 + ((char *)key)[i]; hash = hash * 33 + ((char *)key)[i];
RETURN(hash & mask); return (hash & mask);
} }
/** /**
...@@ -371,7 +324,7 @@ lh_djb2_hash(void *key, size_t size, unsigned mask) ...@@ -371,7 +324,7 @@ lh_djb2_hash(void *key, size_t size, unsigned mask)
static inline unsigned static inline unsigned
lh_u32_hash(__u32 key, unsigned mask) lh_u32_hash(__u32 key, unsigned mask)
{ {
RETURN((key * GOLDEN_RATIO_PRIME_32) & mask); return ((key * CFS_GOLDEN_RATIO_PRIME_32) & mask);
} }
/** /**
...@@ -380,7 +333,7 @@ lh_u32_hash(__u32 key, unsigned mask) ...@@ -380,7 +333,7 @@ lh_u32_hash(__u32 key, unsigned mask)
static inline unsigned static inline unsigned
lh_u64_hash(__u64 key, unsigned mask) lh_u64_hash(__u64 key, unsigned mask)
{ {
RETURN((unsigned)(key * GOLDEN_RATIO_PRIME_64) & mask); return ((unsigned)(key * CFS_GOLDEN_RATIO_PRIME_64) & mask);
} }
#define lh_for_each_bucket(lh, lhb, pos) \ #define lh_for_each_bucket(lh, lhb, pos) \
......
lustre/include/liblustre.h
+ 0
− 37
View file @ cb84e877
...@@ -311,43 +311,6 @@ int in_group_p(gid_t gid); ...@@ -311,43 +311,6 @@ int in_group_p(gid_t gid);
#define might_sleep_if(c) #define might_sleep_if(c)
#define smp_mb() #define smp_mb()
/**
* fls - find last (most-significant) bit set
* @x: the word to search
*
* This is defined the same way as ffs.
* Note fls(0) = 0, fls(1) = 1, fls(0x80000000) = 32.
*/
static inline
int fls(int x)
{
int r = 32;
if (!x)
return 0;
if (!(x & 0xffff0000u)) {
x <<= 16;
r -= 16;
}
if (!(x & 0xff000000u)) {
x <<= 8;
r -= 8;
}
if (!(x & 0xf0000000u)) {
x <<= 4;
r -= 4;
}
if (!(x & 0xc0000000u)) {
x <<= 2;
r -= 2;
}
if (!(x & 0x80000000u)) {
x <<= 1;
r -= 1;
}
return r;
}
static inline static inline
int test_and_set_bit(int nr, unsigned long *addr) int test_and_set_bit(int nr, unsigned long *addr)
{ {
......
lustre/include/linux/lustre_compat25.h
+ 5
− 0
View file @ cb84e877
...@@ -622,5 +622,10 @@ static inline long labs(long x) ...@@ -622,5 +622,10 @@ static inline long labs(long x)
} }
#endif #endif
/* Using kernel fls(). Userspace will use one defined in user-bitops.h. */
#ifndef __fls
#define __fls fls
#endif
#endif /* __KERNEL__ */ #endif /* __KERNEL__ */
#endif /* _COMPAT25_H */ #endif /* _COMPAT25_H */
lustre/obdclass/class_hash.c
+ 40
− 56
View file @ cb84e877
...@@ -88,19 +88,10 @@ lustre_hash_init(char *name, unsigned int cur_size, unsigned int max_size, ...@@ -88,19 +88,10 @@ lustre_hash_init(char *name, unsigned int cur_size, unsigned int max_size,
if (!lh) if (!lh)
RETURN(NULL); RETURN(NULL);
lh->lh_name_size = strlen(name) + 1; strncpy(lh->lh_name, name, sizeof(lh->lh_name));
rwlock_init(&lh->lh_rwlock);
OBD_ALLOC(lh->lh_name, lh->lh_name_size);
if (!lh->lh_name) {
OBD_FREE_PTR(lh);
RETURN(NULL);
}
strncpy(lh->lh_name, name, lh->lh_name_size);
atomic_set(&lh->lh_count, 0);
atomic_set(&lh->lh_rehash_count, 0); atomic_set(&lh->lh_rehash_count, 0);
atomic_set(&lh->lh_count, 0);
rwlock_init(&lh->lh_rwlock);
lh->lh_cur_size = cur_size; lh->lh_cur_size = cur_size;
lh->lh_min_size = cur_size; lh->lh_min_size = cur_size;
lh->lh_max_size = max_size; lh->lh_max_size = max_size;
...@@ -111,7 +102,6 @@ lustre_hash_init(char *name, unsigned int cur_size, unsigned int max_size, ...@@ -111,7 +102,6 @@ lustre_hash_init(char *name, unsigned int cur_size, unsigned int max_size,
OBD_VMALLOC(lh->lh_buckets, sizeof(*lh->lh_buckets) * lh->lh_cur_size); OBD_VMALLOC(lh->lh_buckets, sizeof(*lh->lh_buckets) * lh->lh_cur_size);
if (!lh->lh_buckets) { if (!lh->lh_buckets) {
OBD_FREE(lh->lh_name, lh->lh_name_size);
OBD_FREE_PTR(lh); OBD_FREE_PTR(lh);
RETURN(NULL); RETURN(NULL);
} }
...@@ -157,8 +147,6 @@ lustre_hash_exit(lustre_hash_t *lh) ...@@ -157,8 +147,6 @@ lustre_hash_exit(lustre_hash_t *lh)
} }
OBD_VFREE(lh->lh_buckets, sizeof(*lh->lh_buckets) * lh->lh_cur_size); OBD_VFREE(lh->lh_buckets, sizeof(*lh->lh_buckets) * lh->lh_cur_size);
OBD_FREE(lh->lh_name, lh->lh_name_size);
LASSERT(atomic_read(&lh->lh_count) == 0); LASSERT(atomic_read(&lh->lh_count) == 0);
write_unlock(&lh->lh_rwlock); write_unlock(&lh->lh_rwlock);
...@@ -215,18 +203,14 @@ lustre_hash_add(lustre_hash_t *lh, void *key, struct hlist_node *hnode) ...@@ -215,18 +203,14 @@ lustre_hash_add(lustre_hash_t *lh, void *key, struct hlist_node *hnode)
EXIT; EXIT;
} }
EXPORT_SYMBOL(lustre_hash_add); EXPORT_SYMBOL(lustre_hash_add);
/** static struct hlist_node *
* Add item @hnode to lustre hash @lh using @key. The registered lustre_hash_findadd_unique_hnode(lustre_hash_t *lh, void *key,
* ops->lh_get function will be called if the item was added. struct hlist_node *hnode)
* Returns 0 on success or -EALREADY on key collisions.
*/
int
lustre_hash_add_unique(lustre_hash_t *lh, void *key, struct hlist_node *hnode)
{ {
struct hlist_node *ehnode;
lustre_hash_bucket_t *lhb; lustre_hash_bucket_t *lhb;
int size; int size;
int rc = -EALREADY;
unsigned i; unsigned i;
ENTRY; ENTRY;
...@@ -237,20 +221,41 @@ lustre_hash_add_unique(lustre_hash_t *lh, void *key, struct hlist_node *hnode) ...@@ -237,20 +221,41 @@ lustre_hash_add_unique(lustre_hash_t *lh, void *key, struct hlist_node *hnode)
lhb = &lh->lh_buckets[i]; lhb = &lh->lh_buckets[i];
LASSERT(i < lh->lh_cur_size); LASSERT(i < lh->lh_cur_size);
LASSERT(hlist_unhashed(hnode)); LASSERT(hlist_unhashed(hnode));
write_lock(&lhb->lhb_rwlock); write_lock(&lhb->lhb_rwlock);
if (!__lustre_hash_bucket_lookup(lh, lhb, key)) { ehnode = __lustre_hash_bucket_lookup(lh, lhb, key);
if (ehnode) {
lh_get(lh, ehnode);
} else {
__lustre_hash_bucket_add(lh, lhb, hnode); __lustre_hash_bucket_add(lh, lhb, hnode);
rc = 0; ehnode = hnode;
} }
write_unlock(&lhb->lhb_rwlock); write_unlock(&lhb->lhb_rwlock);
size = lustre_hash_rehash_size(lh); size = lustre_hash_rehash_size(lh);
read_unlock(&lh->lh_rwlock); read_unlock(&lh->lh_rwlock);
if (size) if (size)
lustre_hash_rehash(lh, size); lustre_hash_rehash(lh, size);
RETURN(rc); RETURN(ehnode);
}
/**
* Add item @hnode to lustre hash @lh using @key. The registered
* ops->lh_get function will be called if the item was added.
* Returns 0 on success or -EALREADY on key collisions.
*/
int
lustre_hash_add_unique(lustre_hash_t *lh, void *key, struct hlist_node *hnode)
{
struct hlist_node *ehnode;
ENTRY;
ehnode = lustre_hash_findadd_unique_hnode(lh, key, hnode);
if (ehnode != hnode)
RETURN(-EALREADY);
RETURN(0);
} }
EXPORT_SYMBOL(lustre_hash_add_unique); EXPORT_SYMBOL(lustre_hash_add_unique);
...@@ -264,34 +269,13 @@ void * ...@@ -264,34 +269,13 @@ void *
lustre_hash_findadd_unique(lustre_hash_t *lh, void *key, lustre_hash_findadd_unique(lustre_hash_t *lh, void *key,
struct hlist_node *hnode) struct hlist_node *hnode)
{ {
struct hlist_node *existing_hnode; struct hlist_node *ehnode;
lustre_hash_bucket_t *lhb;
int size;
unsigned i;
void *obj; void *obj;
ENTRY; ENTRY;
__lustre_hash_key_validate(lh, key, hnode); ehnode = lustre_hash_findadd_unique_hnode(lh, key, hnode);
obj = lh_get(lh, ehnode);
read_lock(&lh->lh_rwlock); lh_put(lh, ehnode);
i = lh_hash(lh, key, lh->lh_cur_size - 1);
lhb = &lh->lh_buckets[i];
LASSERT(i < lh->lh_cur_size);
LASSERT(hlist_unhashed(hnode));
write_lock(&lhb->lhb_rwlock);
existing_hnode = __lustre_hash_bucket_lookup(lh, lhb, key);
if (existing_hnode)
obj = lh_get(lh, existing_hnode);
else
obj = __lustre_hash_bucket_add(lh, lhb, hnode);
write_unlock(&lhb->lhb_rwlock);
size = lustre_hash_rehash_size(lh);
read_unlock(&lh->lh_rwlock);
if (size)
lustre_hash_rehash(lh, size);
RETURN(obj); RETURN(obj);
} }
EXPORT_SYMBOL(lustre_hash_findadd_unique); EXPORT_SYMBOL(lustre_hash_findadd_unique);
...@@ -760,7 +744,7 @@ int lustre_hash_debug_str(lustre_hash_t *lh, char *str, int size) ...@@ -760,7 +744,7 @@ int lustre_hash_debug_str(lustre_hash_t *lh, char *str, int size)
* Non-Uniform hash distribution: 128/125/0/0/0/0/2/1 * Non-Uniform hash distribution: 128/125/0/0/0/0/2/1
*/ */
lh_for_each_bucket(lh, lhb, i) lh_for_each_bucket(lh, lhb, i)
dist[MIN(fls(atomic_read(&lhb->lhb_count)/MAX(theta,1)),7)]++; dist[MIN(__fls(atomic_read(&lhb->lhb_count)/MAX(theta,1)),7)]++;
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)
c += snprintf(str + c, size - c, "%d%c", dist[i], c += snprintf(str + c, size - c, "%d%c", dist[i],
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

https://git.gsi.de is provided by CIT→Linux&Web | GSI Helmholtzzentrum fuer Schwerionenforschung GmbH | Imprint (in German) | Privacy policy