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

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

staging/lustre/libcfs: remove waitq_wait 



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 9e795d35

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

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ 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 waitq_wait(wait_queue_t *, long);

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
@@ -3423,7 +3423,7 @@ kiblnd_scheduler(void *arg) 
		add_wait_queue_exclusive(&sched->ibs_waitq, &wait);

		spin_unlock_irqrestore(&sched->ibs_lock, flags);



		waitq_wait(&wait, TASK_INTERRUPTIBLE);

		schedule();

		busy_loops = 0;



		remove_wait_queue(&sched->ibs_waitq, &wait);

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

+1 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ lnet_eq_wait_locked(int *timeout_ms) 
	lnet_eq_wait_unlock();



	if (tms < 0) {

		waitq_wait(&wl, TASK_INTERRUPTIBLE);

		schedule();



	} else {

		struct timeval tv;

drivers/staging/lustre/lustre/fid/fid_request.c

+2 −2
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static int seq_fid_alloc_prep(struct lu_client_seq *seq, 
		set_current_state(TASK_UNINTERRUPTIBLE);

		mutex_unlock(&seq->lcs_mutex);



		waitq_wait(link, TASK_UNINTERRUPTIBLE);

		schedule();



		mutex_lock(&seq->lcs_mutex);

		remove_wait_queue(&seq->lcs_waitq, link);
@@ -378,7 +378,7 @@ void seq_client_flush(struct lu_client_seq *seq) 
		set_current_state(TASK_UNINTERRUPTIBLE);

		mutex_unlock(&seq->lcs_mutex);



		waitq_wait(&link, TASK_UNINTERRUPTIBLE);

		schedule();



		mutex_lock(&seq->lcs_mutex);

		remove_wait_queue(&seq->lcs_waitq, &link);

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

+1 −1
Original line number Diff line number Diff line
@@ -558,7 +558,7 @@ do { \ 
			break;						 \

									       \

		if (__timeout == 0) {					  \

			waitq_wait(&__wait, __wstate);		     \

			schedule();						\

		} else {						       \

			cfs_duration_t interval = info->lwi_interval?	  \

					     min_t(cfs_duration_t,	     \