diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 08:39:49 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-04 08:39:49 +0800 |
| commit | 2f5723a1bf2d2f440b1cf8850bc6a9d8d4e82d3b (patch) | |
| tree | e1f89e2e6f8d01c7918b6b625f353c31dd23e00e /drivers/staging/lustre | |
| parent | 543193511670ecad75267ffd7c9aa110cd30dfdf (diff) | |
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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/lustre')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h | 4 | ||||
| -rw-r--r-- | drivers/staging/lustre/lustre/osc/osc_page.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h index f0184e6eb188..4b84feef05e2 100644 --- a/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h +++ b/drivers/staging/lustre/include/linux/libcfs/linux/linux-prim.h @@ -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 */ diff --git a/drivers/staging/lustre/lustre/osc/osc_page.c b/drivers/staging/lustre/lustre/osc/osc_page.c index 159dda07f43a..d272322b29b6 100644 --- a/drivers/staging/lustre/lustre/osc/osc_page.c +++ b/drivers/staging/lustre/lustre/osc/osc_page.c @@ -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.. */ |