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

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

staging/lustre/libcfs: remove waitq_timedwait 



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 b3669a7f

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

+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ void cfs_pause(cfs_duration_t ticks); 
typedef  void (cfs_timer_func_t)(ulong_ptr_t);

void schedule_timeout_and_set_state(long, int64_t);



int64_t waitq_timedwait(wait_queue_t *, long, int64_t);

void add_wait_queue_exclusive_head(wait_queue_head_t *, wait_queue_t *);



void cfs_init_timer(struct timer_list *t);

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

+1 −1
Original line number Diff line number Diff line
@@ -3208,7 +3208,7 @@ kiblnd_connd (void *arg) 
		add_wait_queue(&kiblnd_data.kib_connd_waitq, &wait);

		spin_unlock_irqrestore(&kiblnd_data.kib_connd_lock, flags);



		waitq_timedwait(&wait, TASK_INTERRUPTIBLE, timeout);

		schedule_timeout(timeout);



		set_current_state(TASK_RUNNING);

		remove_wait_queue(&kiblnd_data.kib_connd_waitq, &wait);

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

+2 −3
Original line number Diff line number Diff line
@@ -2229,7 +2229,7 @@ ksocknal_connd (void *arg) 
		spin_unlock_bh(connd_lock);



		nloops = 0;

		waitq_timedwait(&wait, TASK_INTERRUPTIBLE, timeout);

		schedule_timeout(timeout);



		set_current_state(TASK_RUNNING);

		remove_wait_queue(&ksocknal_data.ksnd_connd_waitq, &wait);
@@ -2639,8 +2639,7 @@ ksocknal_reaper (void *arg) 
		if (!ksocknal_data.ksnd_shuttingdown &&

		    list_empty (&ksocknal_data.ksnd_deathrow_conns) &&

		    list_empty (&ksocknal_data.ksnd_zombie_conns))

			waitq_timedwait (&wait, TASK_INTERRUPTIBLE,

					     timeout);

			schedule_timeout(timeout);



		set_current_state (TASK_RUNNING);

		remove_wait_queue (&ksocknal_data.ksnd_reaper_waitq, &wait);

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

+1 −2
Original line number Diff line number Diff line
@@ -347,8 +347,7 @@ lnet_eq_wait_locked(int *timeout_ms) 
		struct timeval tv;



		now = cfs_time_current();

		waitq_timedwait(&wl, TASK_INTERRUPTIBLE,

				    cfs_time_seconds(tms) / 1000);

		schedule_timeout(cfs_time_seconds(tms) / 1000);

		cfs_duration_usec(cfs_time_sub(cfs_time_current(), now), &tv);

		tms -= (int)(tv.tv_sec * 1000 + tv.tv_usec / 1000);

		if (tms < 0) /* no more wait but may have new event */

drivers/staging/lustre/lustre/include/lustre_lib.h

+1 −3
Original line number Diff line number Diff line
@@ -564,9 +564,7 @@ do { \ 
					     min_t(cfs_duration_t,	     \

						 info->lwi_interval,__timeout):\

					     __timeout;			\

			cfs_duration_t remaining = waitq_timedwait(&__wait,\

						   __wstate,		   \

						   interval);		  \

			cfs_duration_t remaining = schedule_timeout(interval);\

			__timeout = cfs_time_sub(__timeout,		    \

					    cfs_time_sub(interval, remaining));\

			if (__timeout == 0) {				  \