X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=lnet%2Flnet%2Frouter.c;h=f611f311882c3119d55ca97a96be67ec39f6a271;hp=b53545b535407a684cb0b477b663c655ce057ce2;hb=c6aab2ca77831852db22b7dc39baed4d06405b7e;hpb=907a321c9b9e2cd5f5ccf488cc516ba05dee0ad8 diff --git a/lnet/lnet/router.c b/lnet/lnet/router.c index b53545b..f611f31 100644 --- a/lnet/lnet/router.c +++ b/lnet/lnet/router.c @@ -3,8 +3,7 @@ * * Copyright (c) 2011, 2014, Intel Corporation. * - * This file is part of Portals - * http://sourceforge.net/projects/sandiaportals/ + * This file is part of Lustre, https://wiki.hpdd.intel.com/ * * Portals is free software; you can redistribute it and/or * modify it under the terms of version 2 of the GNU General Public @@ -817,8 +816,9 @@ lnet_wait_known_routerstate(void) if (all_known) return; - cfs_pause(cfs_time_seconds(1)); - } + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(1)); + } } void @@ -1194,7 +1194,8 @@ lnet_prune_rc_data(int wait_unlink) i++; CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, "Waiting for rc buffers to unlink\n"); - cfs_pause(cfs_time_seconds(1) / 4); + set_current_state(TASK_UNINTERRUPTIBLE); + schedule_timeout(cfs_time_seconds(1) / 4); lnet_net_lock(LNET_LOCK_EX); } @@ -1275,7 +1276,7 @@ rescan: lnet_prune_rc_data(0); /* don't wait for UNLINK */ - /* Call cfs_pause() here always adds 1 to load average + /* Call schedule_timeout() here always adds 1 to load average * because kernel counts # active tasks as nr_running * + nr_uninterruptible. */ /* if there are any routes then wakeup every second. If