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

Commit e7e73793 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: lustre: remove cfs_task_state_t 



It's just a long, so remove the typedef and use long.

Side note, all the functions like waitq_* should be removed as well,
they are wrapping functions that don't really do what it seems that they
do based on their name.

Cc: Peng Tao <tao.peng@emc.com>
Cc: Andreas Dilger <andreas.dilger@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2f5723a1

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

+3 −3
Original line number Diff line number Diff line
@@ -49,11 +49,11 @@ void cfs_pause(cfs_duration_t ticks); 
 * Timer

 */

typedef  void (cfs_timer_func_t)(ulong_ptr_t);

void schedule_timeout_and_set_state(cfs_task_state_t, int64_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 *, cfs_task_state_t, int64_t);

void waitq_wait(wait_queue_t *, cfs_task_state_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/include/linux/libcfs/linux/linux-prim.h

+0 −5
Original line number Diff line number Diff line
@@ -85,11 +85,6 @@ LL_PROC_PROTO(name) \ 
 */

typedef struct proc_dir_entry	   proc_dir_entry_t;



/*

 * Wait Queue

 */

typedef long			    cfs_task_state_t;



/*

 * Task struct

 */

drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c

+3 −4
Original line number Diff line number Diff line
@@ -81,22 +81,21 @@ add_wait_queue_exclusive_head(wait_queue_head_t *waitq, wait_queue_t *link) 
EXPORT_SYMBOL(add_wait_queue_exclusive_head);



void

waitq_wait(wait_queue_t *link, cfs_task_state_t state)

waitq_wait(wait_queue_t *link, long state)

{

	schedule();

}

EXPORT_SYMBOL(waitq_wait);



int64_t

waitq_timedwait(wait_queue_t *link, cfs_task_state_t state,

		    int64_t timeout)

waitq_timedwait(wait_queue_t *link, long state, int64_t timeout)

{

	return schedule_timeout(timeout);

}

EXPORT_SYMBOL(waitq_timedwait);



void

schedule_timeout_and_set_state(cfs_task_state_t state, int64_t timeout)

schedule_timeout_and_set_state(long state, int64_t timeout)

{

	set_current_state(state);

	schedule_timeout(timeout);