evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: lustre: remove cfs_task_state_t

Browse source 
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2013-08-04 08:48:26 +08:00
parent 2f5723a1bf
commit e7e73793d1
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h
View file

@ -49,11 +49,11 @@ void cfs_pause(cfs_duration_t ticks);
* Timer * Timer
*/ */
typedef void (cfs_timer_func_t)(ulong_ptr_t); 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); void init_waitqueue_entry_current(wait_queue_t *link);
int64_t waitq_timedwait(wait_queue_t *, cfs_task_state_t, int64_t); int64_t waitq_timedwait(wait_queue_t *, long, int64_t);
void waitq_wait(wait_queue_t *, cfs_task_state_t); void waitq_wait(wait_queue_t *, long);
void add_wait_queue_exclusive_head(wait_queue_head_t *, wait_queue_t *); void add_wait_queue_exclusive_head(wait_queue_head_t *, wait_queue_t *);
void cfs_init_timer(struct timer_list *t); void cfs_init_timer(struct timer_list *t);

5
drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h
View file

@ -85,11 +85,6 @@ LL_PROC_PROTO(name) \
*/ */
typedef struct proc_dir_entry proc_dir_entry_t; typedef struct proc_dir_entry proc_dir_entry_t;
/*
* Wait Queue
*/
typedef long cfs_task_state_t;
/* /*
* Task struct * Task struct
*/ */

7
drivers/staging/lustre/lustre/libcfs/linux/linux-prim.c
View file

@ -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); EXPORT_SYMBOL(add_wait_queue_exclusive_head);
void void
waitq_wait(wait_queue_t *link, cfs_task_state_t state) waitq_wait(wait_queue_t *link, long state)
{ {
schedule(); schedule();
} }
EXPORT_SYMBOL(waitq_wait); EXPORT_SYMBOL(waitq_wait);
int64_t int64_t
waitq_timedwait(wait_queue_t *link, cfs_task_state_t state, waitq_timedwait(wait_queue_t *link, long state, int64_t timeout)
int64_t timeout)
{ {
return schedule_timeout(timeout); return schedule_timeout(timeout);
} }
EXPORT_SYMBOL(waitq_timedwait); EXPORT_SYMBOL(waitq_timedwait);
void 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); set_current_state(state);
schedule_timeout(timeout); schedule_timeout(timeout);