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

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

staging: lustre: remove CFS_DECL_WAITQ() macro 



Just use DECLARE_WAIT_QUEUE_HEAD() instead.

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 54319351

drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h

+0 −4
Original line number Diff line number Diff line
@@ -88,12 +88,8 @@ typedef struct proc_dir_entry proc_dir_entry_t; 
/*

 * Wait Queue

 */





typedef long			    cfs_task_state_t;



#define CFS_DECL_WAITQ(wq)		DECLARE_WAIT_QUEUE_HEAD(wq)



/*

 * Task struct

 */

drivers/staging/lustre/lustre/osc/osc_page.c

+1 −1
Original line number Diff line number Diff line
@@ -582,7 +582,7 @@ void osc_page_submit(const struct lu_env *env, struct osc_page *opg, 
 * at any time.

 */



static CFS_DECL_WAITQ(osc_lru_waitq);

static DECLARE_WAIT_QUEUE_HEAD(osc_lru_waitq);

static atomic_t osc_lru_waiters = ATOMIC_INIT(0);

/* LRU pages are freed in batch mode. OSC should at least free this

 * number of pages to avoid running out of LRU budget, and.. */