shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-05-30 15:56:35 +09:00
Code Issues Packages Projects Releases Wiki Activity

staging: lustre: discard CFS_TICK

Browse Source 
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: NeilBrown <neilb@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
NeilBrown
2018-05-21 14:35:12 +10:00
committed by Greg Kroah-Hartman
parent 8cb6514757
commit 0f38211981
5 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/lustre/include/linux/libcfs/libcfs.h
View File

@@ -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.

2
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.h
View File

@@ -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 */

2
drivers/staging/lustre/lustre/osc/osc_request.c
View File

@@ -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.

2
drivers/staging/lustre/lustre/ptlrpc/import.c
View File

@@ -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));

2
drivers/staging/lustre/lustre/ptlrpc/pinger.c
View File

@@ -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;