renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-06 12:44:14 +08:00
Code

staging/lustre/libcfs: remove cfs_hash_long

Browse Source 
Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: Peng Tao <bergwolf@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Peng Tao 2014-02-12 19:21:39 +08:00 committed by Greg Kroah-Hartman
parent 2228c5391b
commit 72c0824a0b
8 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h
View File

@ -65,8 +65,6 @@
#include <linux/hash.h>
#define cfs_hash_long(val, bits) hash_long(val, bits)
/** disable debug */
#define CFS_HASH_DEBUG_NONE 0
/** record hash depth and output to console when it's too deep,

2
drivers/staging/lustre/include/linux/lnet/lib-lnet.h
View File

@ -628,7 +628,7 @@ void lnet_ni_free(lnet_ni_t *ni);
static inline int
lnet_nid2peerhash(lnet_nid_t nid)
{
return cfs_hash_long(nid, LNET_PEER_HASH_BITS);
return hash_long(nid, LNET_PEER_HASH_BITS);
}
static inline struct list_head *

2
drivers/staging/lustre/lnet/lnet/api-ni.c
View File

@ -770,7 +770,7 @@ lnet_nid_cpt_hash(lnet_nid_t nid, unsigned int number)
if (number == 1)
return 0;
val = cfs_hash_long(key, LNET_CPT_BITS);
val = hash_long(key, LNET_CPT_BITS);
/* NB: LNET_CP_NUMBER doesn't have to be PO2 */
if (val < number)
return val;

2
drivers/staging/lustre/lnet/lnet/lib-ptl.c
View File

@ -366,7 +366,7 @@ lnet_mt_match_head(struct lnet_match_table *mtable,
unsigned long hash = mbits + id.nid + id.pid;
LASSERT(lnet_ptl_is_unique(ptl));
hash = cfs_hash_long(hash, LNET_MT_HASH_BITS);
hash = hash_long(hash, LNET_MT_HASH_BITS);
return &mtable->mt_mhash[hash];
}
}

2
drivers/staging/lustre/lustre/include/lustre_fid.h
View File

@ -685,7 +685,7 @@ static inline __u32 fid_hash(const struct lu_fid *f, int bits)
{
/* all objects with same id and different versions will belong to same
* collisions list. */
return cfs_hash_long(fid_flatten(f), bits);
return hash_long(fid_flatten(f), bits);
}
/**

4
drivers/staging/lustre/lustre/ldlm/ldlm_resource.c
View File

@ -421,9 +421,9 @@ static unsigned ldlm_res_hop_fid_hash(struct cfs_hash *hs,
} else {
val = fid_oid(&fid);
}
hash = cfs_hash_long(hash, hs->hs_bkt_bits);
hash = hash_long(hash, hs->hs_bkt_bits);
/* give me another random factor */
hash -= cfs_hash_long((unsigned long)hs, val % 11 + 3);
hash -= hash_long((unsigned long)hs, val % 11 + 3);
hash <<= hs->hs_cur_bits - hs->hs_bkt_bits;
hash |= ldlm_res_hop_hash(hs, key, CFS_HASH_NBKT(hs) - 1);

4
drivers/staging/lustre/lustre/obdclass/lu_object.c
View File

@ -890,10 +890,10 @@ static unsigned lu_obj_hop_hash(struct cfs_hash *hs,
hash = fid_flatten32(fid);
hash += (hash >> 4) + (hash << 12); /* mixing oid and seq */
hash = cfs_hash_long(hash, hs->hs_bkt_bits);
hash = hash_long(hash, hs->hs_bkt_bits);
/* give me another random factor */
hash -= cfs_hash_long((unsigned long)hs, fid_oid(fid) % 11 + 3);
hash -= hash_long((unsigned long)hs, fid_oid(fid) % 11 + 3);
hash <<= hs->hs_cur_bits - hs->hs_bkt_bits;
hash |= (fid_seq(fid) + fid_oid(fid)) & (CFS_HASH_NBKT(hs) - 1);

2
drivers/staging/lustre/lustre/ptlrpc/gss/gss_svc_upcall.c
View File

@ -102,7 +102,7 @@ static inline unsigned long hash_mem(char *buf, int length, int bits)
len++;
if ((len & (BITS_PER_LONG/8-1)) == 0)
hash = cfs_hash_long(hash^l, BITS_PER_LONG);
hash = hash_long(hash^l, BITS_PER_LONG);
} while (len);
return hash >> (BITS_PER_LONG - bits);