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

Commit 322489d9 authored by Pekka Enberg's avatar Pekka Enberg Committed by Greg Kroah-Hartman
Browse files

staging/lustre: Use roundup_pow_of_two() in LNetEQAlloc() 



Use roundup_pow_of_two() and drop the private cfs_power2_roundup()
implementation.

Signed-off-by: default avatarPekka Enberg <penberg@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 36fc2448

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

+0 −13
Original line number Diff line number Diff line
@@ -496,19 +496,6 @@ static inline size_t cfs_round_strlen(char *fset) 
	return (size_t)cfs_size_round((int)strlen(fset) + 1);

}



/* roundup \a val to power2 */

static inline unsigned int cfs_power2_roundup(unsigned int val)

{

	if (val != LOWEST_BIT_SET(val)) { /* not a power of 2 already */

		do {

			val &= ~LOWEST_BIT_SET(val);

		} while (val != LOWEST_BIT_SET(val));

		/* ...and round up */

		val <<= 1;

	}

	return val;

}



#define LOGL(var, len, ptr)				       \

do {							    \

	if (var)						\

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

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ LNetEQAlloc(unsigned int count, lnet_eq_handler_t callback, 
	 * overflow, they don't skip entries, so the queue has the same

	 * apparent capacity at all times */



	count = cfs_power2_roundup(count);

	count = roundup_pow_of_two(count);



	if (callback != LNET_EQ_HANDLER_NONE && count != 0)

		CWARN("EQ callback is guaranteed to get every event, do you still want to set eqcount %d for polling event which will have locking overhead? Please contact with developer to confirm\n", count);