Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 72c0824a authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre/libcfs: remove cfs_hash_long 



Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2228c539

drivers/staging/lustre/include/linux/libcfs/libcfs_hash.h

+0 −2
Original line number Diff line number Diff line
@@ -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,

drivers/staging/lustre/include/linux/lnet/lib-lnet.h

+1 −1
Original line number Diff line number Diff line
@@ -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 *

drivers/staging/lustre/lnet/lnet/api-ni.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/staging/lustre/lnet/lnet/lib-ptl.c

+1 −1
Original line number Diff line number Diff line
@@ -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];

	}

}

drivers/staging/lustre/lustre/include/lustre_fid.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

}



/**