Commit 0f382119 authored by NeilBrown's avatar NeilBrown Committed by Greg Kroah-Hartman
Browse files

staging: lustre: discard CFS_TICK 



This undocumented macro seems to represent "a small amount of time".
Sometimes it is used as-is, some times it is multiplied by 5 for no
obvious reason.
It does not appear that there is any connection between the different
places it is used - they all just want a short period for different
purposes and of different durarions.

So discard CFS_TICK and lets each use-site just use whatever number
of jiffies seems appropriate in that case.

Signed-off-by: default avatarNeilBrown <neilb@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 8cb65147

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

+0 −5
Original line number Diff line number Diff line
@@ -89,11 +89,6 @@ 


#define LIBCFS_VERSION "0.7.0"



/*

 * One jiffy

 */

#define CFS_TICK		(1UL)



/*

 * Lustre Error Checksum: calculates checksum

 * of Hex number by XORing each bit.

drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ 
#define SOCKNAL_PEER_HASH_SIZE  101   /* # peer lists */

#define SOCKNAL_RESCHED         100   /* # scheduler loops before reschedule */

#define SOCKNAL_INSANITY_RECONN 5000  /* connd is trying on reconn infinitely */

#define SOCKNAL_ENOMEM_RETRY    CFS_TICK /* jiffies between retries */

#define SOCKNAL_ENOMEM_RETRY    1     /* jiffies between retries */



#define SOCKNAL_SINGLE_FRAG_TX  0     /* disable multi-fragment sends */

#define SOCKNAL_SINGLE_FRAG_RX  0     /* disable multi-fragment receives */

drivers/staging/lustre/lustre/osc/osc_request.c

+1 −1
Original line number Diff line number Diff line
@@ -748,7 +748,7 @@ static int osc_should_shrink_grant(struct client_obd *client) 
	     OBD_CONNECT_GRANT_SHRINK) == 0)

		return 0;



	if (time_after_eq(time, next_shrink - 5 * CFS_TICK)) {

	if (time_after_eq(time, next_shrink - 5)) {

		/* Get the current RPC size directly, instead of going via:

		 * cli_brw_size(obd->u.cli.cl_import->imp_obd->obd_self_export)

		 * Keep comment here so that it can be found by searching.

drivers/staging/lustre/lustre/ptlrpc/import.c

+1 −1
Original line number Diff line number Diff line
@@ -1501,7 +1501,7 @@ int ptlrpc_disconnect_import(struct obd_import *imp, int noclose) 


		if (wait_event_idle_timeout(imp->imp_recovery_waitq,

					    !ptlrpc_import_in_recovery(imp),

					    max(timeout, CFS_TICK)) == 0)

					    max(timeout, 1UL)) == 0)

			l_wait_event_abortable(

				imp->imp_recovery_waitq,

				!ptlrpc_import_in_recovery(imp));

drivers/staging/lustre/lustre/ptlrpc/pinger.c

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ static void ptlrpc_pinger_process_import(struct obd_import *imp, 


	imp->imp_force_verify = 0;



	if (time_after_eq(imp->imp_next_ping - 5 * CFS_TICK, this_ping) &&

	if (time_after_eq(imp->imp_next_ping - 5, this_ping) &&

	    !force) {

		spin_unlock(&imp->imp_lock);

		return;