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

Commit d3caf4d5 authored by Peng Tao's avatar Peng Tao Committed by Greg Kroah-Hartman
Browse files

staging/lustre/libcfs: remove cfs_pause 



Cc: Andreas Dilger <andreas.dilger@intel.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarPeng Tao <bergwolf@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 18fd5baa

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

+0 −5
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ 
#ifndef __LIBCFS_PRIM_H__

#define __LIBCFS_PRIM_H__



/*

 * Schedule

 */

void cfs_pause(cfs_duration_t ticks);



/*

 * Timer

 */

drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c

+4 −2
Original line number Diff line number Diff line
@@ -2774,7 +2774,8 @@ kiblnd_base_shutdown(void) 
			CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, /* power of 2? */

			       "Waiting for %d threads to terminate\n",

			       atomic_read(&kiblnd_data.kib_nthreads));

			cfs_pause(cfs_time_seconds(1));

			set_current_state(TASK_UNINTERRUPTIBLE);

			schedule_timeout(cfs_time_seconds(1));

		}



		/* fall through */
@@ -2835,7 +2836,8 @@ kiblnd_shutdown (lnet_ni_t *ni) 
			       "%s: waiting for %d peers to disconnect\n",

			       libcfs_nid2str(ni->ni_nid),

			       atomic_read(&net->ibn_npeers));

			cfs_pause(cfs_time_seconds(1));

			set_current_state(TASK_UNINTERRUPTIBLE);

			schedule_timeout(cfs_time_seconds(1));

		}



		kiblnd_net_fini_pools(net);

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

+4 −2
Original line number Diff line number Diff line
@@ -2336,7 +2336,8 @@ ksocknal_base_shutdown(void) 
			       "waiting for %d threads to terminate\n",

				ksocknal_data.ksnd_nthreads);

			read_unlock(&ksocknal_data.ksnd_global_lock);

			cfs_pause(cfs_time_seconds(1));

			set_current_state(TASK_UNINTERRUPTIBLE);

			schedule_timeout(cfs_time_seconds(1));

			read_lock(&ksocknal_data.ksnd_global_lock);

		}

		read_unlock(&ksocknal_data.ksnd_global_lock);
@@ -2584,7 +2585,8 @@ ksocknal_shutdown (lnet_ni_t *ni) 
		CDEBUG(((i & (-i)) == i) ? D_WARNING : D_NET, /* power of 2? */

		       "waiting for %d peers to disconnect\n",

		       net->ksnn_npeers);

		cfs_pause(cfs_time_seconds(1));

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(cfs_time_seconds(1));



		ksocknal_debug_peerhash(ni);

drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c

+4 −2
Original line number Diff line number Diff line
@@ -189,7 +189,8 @@ ksocknal_transmit (ksock_conn_t *conn, ksock_tx_t *tx) 
	int      bufnob;



	if (ksocknal_data.ksnd_stall_tx != 0) {

		cfs_pause(cfs_time_seconds(ksocknal_data.ksnd_stall_tx));

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(cfs_time_seconds(ksocknal_data.ksnd_stall_tx));

	}



	LASSERT (tx->tx_resid != 0);
@@ -345,7 +346,8 @@ ksocknal_receive (ksock_conn_t *conn) 
	int     rc;



	if (ksocknal_data.ksnd_stall_rx != 0) {

		cfs_pause(cfs_time_seconds (ksocknal_data.ksnd_stall_rx));

		set_current_state(TASK_UNINTERRUPTIBLE);

		schedule_timeout(cfs_time_seconds(ksocknal_data.ksnd_stall_rx));

	}



	rc = ksocknal_connsock_addref(conn);

drivers/staging/lustre/lnet/lnet/acceptor.c

+2 −1
Original line number Diff line number Diff line
@@ -371,7 +371,8 @@ lnet_acceptor(void *arg) 
		if (rc != 0) {

			if (rc != -EAGAIN) {

				CWARN("Accept error %d: pausing...\n", rc);

				cfs_pause(cfs_time_seconds(1));

				set_current_state(TASK_UNINTERRUPTIBLE);

				schedule_timeout(cfs_time_seconds(1));

			}

			continue;

		}