Commit b2f005f7 authored by James Simmons's avatar James Simmons Committed by Greg Kroah-Hartman
Browse files

staging: lustre: remove white space in hash.c 



Cleanup all the unneeded white space in hash.c.

Signed-off-by: default avatarJames Simmons <jsimmons@infradead.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 12550e0c

drivers/staging/lustre/lustre/libcfs/hash.c

+177 −165
Original line number Diff line number Diff line
@@ -665,7 +665,8 @@ cfs_hash_bd_lookup_intent(struct cfs_hash *hs, struct cfs_hash_bd *bd, 
}



struct hlist_node *

cfs_hash_bd_lookup_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd, const void *key)

cfs_hash_bd_lookup_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd,

			  const void *key)

{

	return cfs_hash_bd_lookup_intent(hs, bd, key, NULL,

					 CFS_HS_LOOKUP_IT_FIND);
@@ -673,7 +674,8 @@ cfs_hash_bd_lookup_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd, const voi 
EXPORT_SYMBOL(cfs_hash_bd_lookup_locked);



struct hlist_node *

cfs_hash_bd_peek_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd, const void *key)

cfs_hash_bd_peek_locked(struct cfs_hash *hs, struct cfs_hash_bd *bd,

			const void *key)

{

	return cfs_hash_bd_lookup_intent(hs, bd, key, NULL,

					 CFS_HS_LOOKUP_IT_PEEK);
@@ -756,8 +758,8 @@ cfs_hash_multi_bd_lookup_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds, 
}



static struct hlist_node *

cfs_hash_multi_bd_findadd_locked(struct cfs_hash *hs,

				 struct cfs_hash_bd *bds, unsigned n, const void *key,

cfs_hash_multi_bd_findadd_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds,

				 unsigned n, const void *key,

				 struct hlist_node *hnode, int noref)

{

	struct hlist_node *ehnode;
@@ -792,7 +794,7 @@ cfs_hash_multi_bd_finddel_locked(struct cfs_hash *hs, struct cfs_hash_bd *bds, 
				 struct hlist_node *hnode)

{

	struct hlist_node *ehnode;

	unsigned	   i;

	unsigned int i;



	cfs_hash_for_each_bd(bds, n, i) {

		ehnode = cfs_hash_bd_lookup_intent(hs, &bds[i], key, hnode,
@@ -831,7 +833,8 @@ cfs_hash_bd_order(struct cfs_hash_bd *bd1, struct cfs_hash_bd *bd2) 
}



void

cfs_hash_dual_bd_get(struct cfs_hash *hs, const void *key, struct cfs_hash_bd *bds)

cfs_hash_dual_bd_get(struct cfs_hash *hs, const void *key,

		     struct cfs_hash_bd *bds)

{

	/* NB: caller should hold hs_lock.rw if REHASH is set */

	cfs_hash_bd_from_key(hs, hs->hs_buckets,
@@ -1276,7 +1279,8 @@ cfs_hash_find_or_add(struct cfs_hash *hs, const void *key, 
 * Returns 0 on success or -EALREADY on key collisions.

 */

int

cfs_hash_add_unique(struct cfs_hash *hs, const void *key, struct hlist_node *hnode)

cfs_hash_add_unique(struct cfs_hash *hs, const void *key,

		    struct hlist_node *hnode)

{

	return cfs_hash_find_or_add(hs, key, hnode, 1) != hnode ?

	       -EALREADY : 0;
@@ -1383,7 +1387,8 @@ cfs_hash_lookup(struct cfs_hash *hs, const void *key) 
EXPORT_SYMBOL(cfs_hash_lookup);



static void

cfs_hash_for_each_enter(struct cfs_hash *hs) {

cfs_hash_for_each_enter(struct cfs_hash *hs)

{

	LASSERT(!cfs_hash_is_exiting(hs));



	if (!cfs_hash_with_rehash(hs))
@@ -1408,7 +1413,8 @@ cfs_hash_for_each_enter(struct cfs_hash *hs) { 
}



static void

cfs_hash_for_each_exit(struct cfs_hash *hs) {

cfs_hash_for_each_exit(struct cfs_hash *hs)

{

	int remained;

	int bits;
@@ -1439,7 +1445,8 @@ cfs_hash_for_each_exit(struct cfs_hash *hs) { 
 */

static __u64

cfs_hash_for_each_tight(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,

			void *data, int remove_safe) {

			void *data, int remove_safe)

{

	struct hlist_node *hnode;

	struct hlist_node *pos;

	struct cfs_hash_bd bd;
@@ -1523,16 +1530,17 @@ cfs_hash_cond_del(struct cfs_hash *hs, cfs_hash_cond_opt_cb_t func, void *data) 
EXPORT_SYMBOL(cfs_hash_cond_del);



void

cfs_hash_for_each(struct cfs_hash *hs,

		  cfs_hash_for_each_cb_t func, void *data)

cfs_hash_for_each(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,

		  void *data)

{

	cfs_hash_for_each_tight(hs, func, data, 0);

}

EXPORT_SYMBOL(cfs_hash_for_each);



void

cfs_hash_for_each_safe(struct cfs_hash *hs,

		       cfs_hash_for_each_cb_t func, void *data) {

cfs_hash_for_each_safe(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,

		       void *data)

{

	cfs_hash_for_each_tight(hs, func, data, 1);

}

EXPORT_SYMBOL(cfs_hash_for_each_safe);
@@ -1581,7 +1589,8 @@ EXPORT_SYMBOL(cfs_hash_size_get); 
 */

static int

cfs_hash_for_each_relax(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,

			void *data) {

			void *data)

{

	struct hlist_node *hnode;

	struct hlist_node *tmp;

	struct cfs_hash_bd bd;
@@ -1645,8 +1654,9 @@ cfs_hash_for_each_relax(struct cfs_hash *hs, cfs_hash_for_each_cb_t func, 
}



int

cfs_hash_for_each_nolock(struct cfs_hash *hs,

			 cfs_hash_for_each_cb_t func, void *data) {

cfs_hash_for_each_nolock(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,

			 void *data)

{

	if (cfs_hash_with_no_lock(hs) ||

	    cfs_hash_with_rehash_key(hs) ||

	    !cfs_hash_with_no_itemref(hs))
@@ -1677,8 +1687,9 @@ EXPORT_SYMBOL(cfs_hash_for_each_nolock); 
 * the required locking is in place to prevent concurrent insertions.

 */

int

cfs_hash_for_each_empty(struct cfs_hash *hs,

			cfs_hash_for_each_cb_t func, void *data) {

cfs_hash_for_each_empty(struct cfs_hash *hs, cfs_hash_for_each_cb_t func,

			void *data)

{

	unsigned i = 0;



	if (cfs_hash_with_no_lock(hs))
@@ -1736,10 +1747,11 @@ EXPORT_SYMBOL(cfs_hash_hlist_for_each); 
   */

void

cfs_hash_for_each_key(struct cfs_hash *hs, const void *key,

		      cfs_hash_for_each_cb_t func, void *data) {

		      cfs_hash_for_each_cb_t func, void *data)

{

	struct hlist_node *hnode;

	struct cfs_hash_bd bds[2];

	unsigned	    i;

	unsigned int i;



	cfs_hash_lock(hs, 0);