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

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

staging/lustre/libcfs: remove init_waitqueue_entry_current 



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 6d56be08

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



void init_waitqueue_entry_current(wait_queue_t *link);

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

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

+3 −3
Original line number Diff line number Diff line
@@ -3127,7 +3127,7 @@ kiblnd_connd (void *arg) 


	cfs_block_allsigs ();



	init_waitqueue_entry_current (&wait);

	init_waitqueue_entry(&wait, current);

	kiblnd_data.kib_connd = current;



	spin_lock_irqsave(&kiblnd_data.kib_connd_lock, flags);
@@ -3324,7 +3324,7 @@ kiblnd_scheduler(void *arg) 


	cfs_block_allsigs();



	init_waitqueue_entry_current(&wait);

	init_waitqueue_entry(&wait, current);



	sched = kiblnd_data.kib_scheds[KIB_THREAD_CPT(id)];
@@ -3450,7 +3450,7 @@ kiblnd_failover_thread(void *arg) 


	cfs_block_allsigs ();



	init_waitqueue_entry_current(&wait);

	init_waitqueue_entry(&wait, current);

	write_lock_irqsave(glock, flags);



	while (!kiblnd_data.kib_shutdown) {

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

+2 −2
Original line number Diff line number Diff line
@@ -2140,7 +2140,7 @@ ksocknal_connd (void *arg) 


	cfs_block_allsigs ();



	init_waitqueue_entry_current (&wait);

	init_waitqueue_entry(&wait, current);



	spin_lock_bh(connd_lock);
@@ -2532,7 +2532,7 @@ ksocknal_reaper (void *arg) 
	cfs_block_allsigs ();



	INIT_LIST_HEAD(&enomem_conns);

	init_waitqueue_entry_current (&wait);

	init_waitqueue_entry(&wait, current);



	spin_lock_bh(&ksocknal_data.ksnd_reaper_lock);

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

+1 −1
Original line number Diff line number Diff line
@@ -334,7 +334,7 @@ lnet_eq_wait_locked(int *timeout_ms) 
	if (tms == 0)

		return -1; /* don't want to wait and no new event */



	init_waitqueue_entry_current(&wl);

	init_waitqueue_entry(&wl, current);

	set_current_state(TASK_INTERRUPTIBLE);

	add_wait_queue(&the_lnet.ln_eq_waitq, &wl);

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

+3 −3
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int seq_client_get_seq(const struct lu_env *env, 


	LASSERT(seqnr != NULL);

	mutex_lock(&seq->lcs_mutex);

	init_waitqueue_entry_current(&link);

	init_waitqueue_entry(&link, current);



	while (1) {

		rc = seq_fid_alloc_prep(seq, &link);
@@ -306,7 +306,7 @@ int seq_client_alloc_fid(const struct lu_env *env, 
	LASSERT(seq != NULL);

	LASSERT(fid != NULL);



	init_waitqueue_entry_current(&link);

	init_waitqueue_entry(&link, current);

	mutex_lock(&seq->lcs_mutex);



	if (OBD_FAIL_CHECK(OBD_FAIL_SEQ_EXHAUST))
@@ -370,7 +370,7 @@ void seq_client_flush(struct lu_client_seq *seq) 
	wait_queue_t link;



	LASSERT(seq != NULL);

	init_waitqueue_entry_current(&link);

	init_waitqueue_entry(&link, current);

	mutex_lock(&seq->lcs_mutex);



	while (seq->lcs_update) {