From 3e17d8c613b12bc5effeeaa201a412846dff020e Mon Sep 17 00:00:00 2001

From: Mel Gorman <mgorman@suse.de>

Date: Wed, 30 Aug 2017 09:58:17 +0100

Subject: [PATCH] sched/wait: Rename wait_queue_t => wait_queue_entry_t

References: bnc#971975 VM performance -- page waitqueue

Patch-mainline: v4.13

Git-commit: ac6424b981bce1c4bc55675c6ce11bfe1bbfa64f

Rename:

	wait_queue_t		=>	wait_queue_entry_t

'wait_queue_t' was always a slight misnomer: its name implies that it's a "queue",

but in reality it's a queue *entry*. The 'real' queue is the wait queue head,

which had to carry the name.

Start sorting this out by renaming it to 'wait_queue_entry_t'.

This also allows the real structure name 'struct __wait_queue' to

lose its double underscore and become 'struct wait_queue_entry',

which is the more canonical nomenclature for such data types.

Cc: Linus Torvalds <torvalds@linux-foundation.org>

Cc: Peter Zijlstra <peterz@infradead.org>

Cc: Thomas Gleixner <tglx@linutronix.de>

Cc: linux-kernel@vger.kernel.org

Signed-off-by: Ingo Molnar <mingo@kernel.org>

Signed-off-by: Mel Gorman <mgorman@suse.de>

---

 Documentation/DocBook/kernel-hacking.tmpl              |    2 

 Documentation/filesystems/autofs4.txt                  |   12 +--

 block/blk-mq.c                                         |    2 

 block/blk-wbt.c                                        |    2 

 block/kyber-iosched.c                                  |    8 +-

 drivers/bluetooth/btmrvl_main.c                        |    2 

 drivers/char/ipmi/ipmi_watchdog.c                      |    2 

 drivers/gpu/drm/i915/i915_gem_request.h                |    2 

 drivers/gpu/drm/i915/i915_sw_fence.c                   |   14 +--

 drivers/gpu/drm/i915/i915_sw_fence.h                   |    2 

 drivers/gpu/drm/radeon/radeon.h                        |    2 

 drivers/gpu/drm/radeon/radeon_fence.c                  |    2 

 drivers/gpu/vga/vgaarb.c                               |    2 

 drivers/infiniband/hw/i40iw/i40iw_main.c               |    2 

 drivers/md/bcache/btree.h                              |    2 

 drivers/net/ethernet/cavium/liquidio/octeon_main.h     |    4 -

 drivers/net/wireless/cisco/airo.c                      |    2 

 drivers/net/wireless/intersil/hostap/hostap_ioctl.c    |    2 

 drivers/net/wireless/marvell/libertas/main.c           |    2 

 drivers/scsi/dpt/dpti_i2o.h                            |    2 

 drivers/scsi/ips.c                                     |   12 +--

 drivers/scsi/ips.h                                     |    4 -

 drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c |    6 -

 drivers/staging/lustre/lnet/klnds/socklnd/socklnd_cb.c |    4 -

 drivers/staging/lustre/lnet/libcfs/debug.c             |    2 

 drivers/staging/lustre/lnet/libcfs/tracefile.c         |    2 

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

 drivers/staging/lustre/lnet/lnet/lib-socket.c          |    2 

 drivers/staging/lustre/lustre/fid/fid_request.c        |    6 -

 drivers/staging/lustre/lustre/include/lustre_lib.h     |    4 -

 drivers/staging/lustre/lustre/llite/lcommon_cl.c       |    2 

 drivers/staging/lustre/lustre/lov/lov_cl_internal.h    |    2 

 drivers/staging/lustre/lustre/lov/lov_object.c         |    2 

 drivers/staging/lustre/lustre/obdclass/lu_object.c     |    6 -

 drivers/tty/synclink_gt.c                              |    2 

 drivers/vfio/virqfd.c                                  |    2 

 drivers/vhost/vhost.c                                  |    2 

 drivers/vhost/vhost.h                                  |    2 

 fs/autofs4/autofs_i.h                                  |    2 

 fs/autofs4/waitq.c                                     |   18 ++--

 fs/cachefiles/internal.h                               |    2 

 fs/cachefiles/namei.c                                  |    2 

 fs/cachefiles/rdwr.c                                   |    2 

 fs/dax.c                                               |    4 -

 fs/eventfd.c                                           |    2 

 fs/eventpoll.c                                         |   10 +-

 fs/fs_pin.c                                            |    2 

 fs/nfs/nfs4proc.c                                      |    4 -

 fs/nilfs2/segment.c                                    |    2 

 fs/orangefs/orangefs-bufmap.c                          |    4 -

 fs/reiserfs/journal.c                                  |    2 

 fs/select.c                                            |    4 -

 fs/signalfd.c                                          |    2 

 fs/userfaultfd.c                                       |    8 +-

 include/linux/blk-mq.h                                 |    2 

 include/linux/eventfd.h                                |    4 -

 include/linux/kvm_irqfd.h                              |    2 

 include/linux/pagemap.h                                |    2 

 include/linux/poll.h                                   |    2 

 include/linux/vfio.h                                   |    2 

 include/linux/wait.h                                   |   67 ++++++++---------

 include/net/af_unix.h                                  |    2 

 include/uapi/linux/auto_fs.h                           |    4 -

 include/uapi/linux/auto_fs4.h                          |    4 -

 kernel/exit.c                                          |    4 -

 kernel/futex.c                                         |    2 

 kernel/sched/completion.c                              |    2 

 kernel/sched/core.c                                    |    2 

 kernel/sched/wait.c                                    |   42 +++++-----

 kernel/workqueue.c                                     |    4 -

 mm/filemap.c                                           |   10 +-

 mm/memcontrol.c                                        |    8 +-

 mm/mempool.c                                           |    2 

 mm/shmem.c                                             |    2 

 net/9p/trans_fd.c                                      |    4 -

 net/bluetooth/hidp/core.c                              |    2 

 net/core/datagram.c                                    |    2 

 net/unix/af_unix.c                                     |    4 -

 sound/core/control.c                                   |    2 

 sound/core/hwdep.c                                     |    2 

 sound/core/init.c                                      |    2 

 sound/core/oss/pcm_oss.c                               |    4 -

 sound/core/pcm_lib.c                                   |    2 

 sound/core/pcm_native.c                                |    4 -

 sound/core/rawmidi.c                                   |    8 +-

 sound/core/seq/seq_fifo.c                              |    2 

 sound/core/seq/seq_memory.c                            |    2 

 sound/core/timer.c                                     |    2 

 sound/isa/wavefront/wavefront_synth.c                  |    2 

 sound/pci/mixart/mixart_core.c                         |    4 -

 sound/pci/ymfpci/ymfpci_main.c                         |    2 

 virt/kvm/eventfd.c                                     |    2 

 92 files changed, 214 insertions(+), 211 deletions(-)

--- a/Documentation/DocBook/kernel-hacking.tmpl

+++ b/Documentation/DocBook/kernel-hacking.tmpl

@@ -819,7 +819,7 @@ printk(KERN_INFO "my ip: %pI4\n", &i

    certain condition is true.  They must be used carefully to ensure

    there is no race condition.  You declare a

    <type>wait_queue_head_t</type>, and then processes which want to

-   wait for that condition declare a <type>wait_queue_t</type>

+   wait for that condition declare a <type>wait_queue_entry_t</type>

    referring to themselves, and place that in the queue.

   </para>

--- a/Documentation/filesystems/autofs4.txt

+++ b/Documentation/filesystems/autofs4.txt

@@ -316,7 +316,7 @@ For version 5, the format of the message

         struct autofs_v5_packet {

                 int proto_version;                /* Protocol version */

                 int type;                        /* Type of packet */

-                autofs_wqt_t wait_queue_token;

+                autofs_wqt_t wait_queue_entry_token;

                 __u32 dev;

                 __u64 ino;

                 __u32 uid;

@@ -341,12 +341,12 @@ The pipe will be set to "packet mode" (e

 `O_DIRECT`) to _pipe2(2)_ so that a read from the pipe will return at

 most one packet, and any unread portion of a packet will be discarded.

-The `wait_queue_token` is a unique number which can identify a

+The `wait_queue_entry_token` is a unique number which can identify a

 particular request to be acknowledged.  When a message is sent over

 the pipe the affected dentry is marked as either "active" or

 "expiring" and other accesses to it block until the message is

 acknowledged using one of the ioctls below and the relevant

-`wait_queue_token`.

+`wait_queue_entry_token`.

 Communicating with autofs: root directory ioctls

 ------------------------------------------------

@@ -358,7 +358,7 @@ capability, or must be the automount dae

 The available ioctl commands are:

 - **AUTOFS_IOC_READY**: a notification has been handled.  The argument

-    to the ioctl command is the "wait_queue_token" number

+    to the ioctl command is the "wait_queue_entry_token" number

     corresponding to the notification being acknowledged.

 - **AUTOFS_IOC_FAIL**: similar to above, but indicates failure with

     the error code `ENOENT`.

@@ -382,14 +382,14 @@ The available ioctl commands are:

         struct autofs_packet_expire_multi {

                 int proto_version;              /* Protocol version */

                 int type;                       /* Type of packet */

-                autofs_wqt_t wait_queue_token;

+                autofs_wqt_t wait_queue_entry_token;

                 int len;

                 char name[NAME_MAX+1];

         };

      is required.  This is filled in with the name of something

      that can be unmounted or removed.  If nothing can be expired,

-     `errno` is set to `EAGAIN`.  Even though a `wait_queue_token`

+     `errno` is set to `EAGAIN`.  Even though a `wait_queue_entry_token`

      is present in the structure, no "wait queue" is established

      and no acknowledgment is needed.

 - **AUTOFS_IOC_EXPIRE_MULTI**:  This is similar to

--- a/block/blk-mq.c

+++ b/block/blk-mq.c

@@ -923,7 +923,7 @@ static bool reorder_tags_to_front(struct

 	return first != NULL;

 }

-static int blk_mq_dispatch_wake(wait_queue_t *wait, unsigned mode, int flags,

+static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode, int flags,

 				void *key)

 {

 	struct blk_mq_hw_ctx *hctx;

--- a/block/blk-wbt.c

+++ b/block/blk-wbt.c

@@ -503,7 +503,7 @@ static inline unsigned int get_limit(str

 }

 static inline bool may_queue(struct rq_wb *rwb, struct rq_wait *rqw,

-			     wait_queue_t *wait, unsigned long rw)

+			     wait_queue_entry_t *wait, unsigned long rw)

 {

 	/*

 	 * inc it here even if disabled, since we'll dec it at completion.

--- a/block/kyber-iosched.c

+++ b/block/kyber-iosched.c

@@ -99,7 +99,7 @@ struct kyber_hctx_data {

 	struct list_head rqs[KYBER_NUM_DOMAINS];

 	unsigned int cur_domain;

 	unsigned int batching;

-	wait_queue_t domain_wait[KYBER_NUM_DOMAINS];

+	wait_queue_entry_t domain_wait[KYBER_NUM_DOMAINS];

 	atomic_t wait_index[KYBER_NUM_DOMAINS];

 };

@@ -507,7 +507,7 @@ static void kyber_flush_busy_ctxs(struct

 	}

 }

-static int kyber_domain_wake(wait_queue_t *wait, unsigned mode, int flags,

+static int kyber_domain_wake(wait_queue_entry_t *wait, unsigned mode, int flags,

 			     void *key)

 {

 	struct blk_mq_hw_ctx *hctx = READ_ONCE(wait->private);

@@ -523,7 +523,7 @@ static int kyber_get_domain_token(struct

 {

 	unsigned int sched_domain = khd->cur_domain;

 	struct sbitmap_queue *domain_tokens = &kqd->domain_tokens[sched_domain];

-	wait_queue_t *wait = &khd->domain_wait[sched_domain];

+	wait_queue_entry_t *wait = &khd->domain_wait[sched_domain];

 	struct sbq_wait_state *ws;

 	int nr;

@@ -734,7 +734,7 @@ static int kyber_##name##_waiting_show(v

 {									\

 	struct blk_mq_hw_ctx *hctx = data;				\

 	struct kyber_hctx_data *khd = hctx->sched_data;			\

-	wait_queue_t *wait = &khd->domain_wait[domain];			\

+	wait_queue_entry_t *wait = &khd->domain_wait[domain];		\

 									\

 	seq_printf(m, "%d\n", !list_empty_careful(&wait->task_list));	\

 	return 0;							\

--- a/drivers/bluetooth/btmrvl_main.c

+++ b/drivers/bluetooth/btmrvl_main.c

@@ -602,7 +602,7 @@ static int btmrvl_service_main_thread(vo

 	struct btmrvl_thread *thread = data;

 	struct btmrvl_private *priv = thread->priv;

 	struct btmrvl_adapter *adapter = priv->adapter;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	struct sk_buff *skb;

 	ulong flags;

--- a/drivers/char/ipmi/ipmi_watchdog.c

+++ b/drivers/char/ipmi/ipmi_watchdog.c

@@ -821,7 +821,7 @@ static ssize_t ipmi_read(struct file *fi

 			 loff_t      *ppos)

 {

 	int          rv = 0;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	if (count <= 0)

 		return 0;

--- a/drivers/gpu/drm/i915/i915_gem_request.h

+++ b/drivers/gpu/drm/i915/i915_gem_request.h

@@ -123,7 +123,7 @@ struct drm_i915_gem_request {

 	 * It is used by the driver to then queue the request for execution.

 	 */

 	struct i915_sw_fence submit;

-	wait_queue_t submitq;

+	wait_queue_entry_t submitq;

 	wait_queue_head_t execute;

 	/* A list of everyone we wait upon, and everyone who waits upon us.

--- a/drivers/gpu/drm/i915/i915_sw_fence.c

+++ b/drivers/gpu/drm/i915/i915_sw_fence.c

@@ -152,7 +152,7 @@ static void __i915_sw_fence_wake_up_all(

 					struct list_head *continuation)

 {

 	wait_queue_head_t *x = &fence->wait;

-	wait_queue_t *pos, *next;

+	wait_queue_entry_t *pos, *next;

 	unsigned long flags;

 	debug_fence_deactivate(fence);

@@ -254,7 +254,7 @@ void i915_sw_fence_commit(struct i915_sw

 	__i915_sw_fence_commit(fence);

 }

-static int i915_sw_fence_wake(wait_queue_t *wq, unsigned mode, int flags, void *key)

+static int i915_sw_fence_wake(wait_queue_entry_t *wq, unsigned mode, int flags, void *key)

 {

 	list_del(&wq->task_list);

 	__i915_sw_fence_complete(wq->private, key);

@@ -267,7 +267,7 @@ static int i915_sw_fence_wake(wait_queue

 static bool __i915_sw_fence_check_if_after(struct i915_sw_fence *fence,

 				    const struct i915_sw_fence * const signaler)

 {

-	wait_queue_t *wq;

+	wait_queue_entry_t *wq;

 	if (__test_and_set_bit(I915_SW_FENCE_CHECKED_BIT, &fence->flags))

 		return false;

@@ -288,7 +288,7 @@ static bool __i915_sw_fence_check_if_aft

 static void __i915_sw_fence_clear_checked_bit(struct i915_sw_fence *fence)

 {

-	wait_queue_t *wq;

+	wait_queue_entry_t *wq;

 	if (!__test_and_clear_bit(I915_SW_FENCE_CHECKED_BIT, &fence->flags))

 		return;

@@ -320,7 +320,7 @@ static bool i915_sw_fence_check_if_after

 static int __i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,

 					  struct i915_sw_fence *signaler,

-					  wait_queue_t *wq, gfp_t gfp)

+					  wait_queue_entry_t *wq, gfp_t gfp)

 {

 	unsigned long flags;

 	int pending;

@@ -359,7 +359,7 @@ static int __i915_sw_fence_await_sw_fenc

 	spin_lock_irqsave(&signaler->wait.lock, flags);

 	if (likely(!i915_sw_fence_done(signaler))) {

-		__add_wait_queue_tail(&signaler->wait, wq);

+		__add_wait_queue_entry_tail(&signaler->wait, wq);

 		pending = 1;

 	} else {

 		i915_sw_fence_wake(wq, 0, 0, NULL);

@@ -372,7 +372,7 @@ static int __i915_sw_fence_await_sw_fenc

 int i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,

 				 struct i915_sw_fence *signaler,

-				 wait_queue_t *wq)

+				 wait_queue_entry_t *wq)

 {

 	return __i915_sw_fence_await_sw_fence(fence, signaler, wq, 0);

 }

--- a/drivers/gpu/drm/i915/i915_sw_fence.h

+++ b/drivers/gpu/drm/i915/i915_sw_fence.h

@@ -66,7 +66,7 @@ void i915_sw_fence_commit(struct i915_sw

 int i915_sw_fence_await_sw_fence(struct i915_sw_fence *fence,

 				 struct i915_sw_fence *after,

-				 wait_queue_t *wq);

+				 wait_queue_entry_t *wq);

 int i915_sw_fence_await_sw_fence_gfp(struct i915_sw_fence *fence,

 				     struct i915_sw_fence *after,

 				     gfp_t gfp);

--- a/drivers/gpu/drm/radeon/radeon.h

+++ b/drivers/gpu/drm/radeon/radeon.h

@@ -375,7 +375,7 @@ struct radeon_fence {

 	unsigned		ring;

 	bool			is_vm_update;

-	wait_queue_t		fence_wake;

+	wait_queue_entry_t		fence_wake;

 };

 int radeon_fence_driver_start_ring(struct radeon_device *rdev, int ring);

--- a/drivers/gpu/drm/radeon/radeon_fence.c

+++ b/drivers/gpu/drm/radeon/radeon_fence.c

@@ -158,7 +158,7 @@ int radeon_fence_emit(struct radeon_devi

  * for the fence locking itself, so unlocked variants are used for

  * fence_signal, and remove_wait_queue.

  */

-static int radeon_fence_check_signaled(wait_queue_t *wait, unsigned mode, int flags, void *key)

+static int radeon_fence_check_signaled(wait_queue_entry_t *wait, unsigned mode, int flags, void *key)

 {

 	struct radeon_fence *fence;

 	u64 seq;

--- a/drivers/gpu/vga/vgaarb.c

+++ b/drivers/gpu/vga/vgaarb.c

@@ -417,7 +417,7 @@ int vga_get(struct pci_dev *pdev, unsign

 {

 	struct vga_device *vgadev, *conflict;

 	unsigned long flags;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	int rc = 0;

 	vga_check_first_use();

--- a/drivers/infiniband/hw/i40iw/i40iw_main.c

+++ b/drivers/infiniband/hw/i40iw/i40iw_main.c

@@ -1939,7 +1939,7 @@ static int i40iw_virtchnl_receive(struct

 bool i40iw_vf_clear_to_send(struct i40iw_sc_dev *dev)

 {

 	struct i40iw_device *iwdev;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	iwdev = dev->back_dev;

--- a/drivers/md/bcache/btree.h

+++ b/drivers/md/bcache/btree.h

@@ -207,7 +207,7 @@ void bkey_put(struct cache_set *c, struc

 struct btree_op {

 	/* for waiting on btree reserve in btree_split() */

-	wait_queue_t		wait;

+	wait_queue_entry_t		wait;

 	/* Btree level at which we start taking write locks */

 	short			lock;

--- a/drivers/net/ethernet/cavium/liquidio/octeon_main.h

+++ b/drivers/net/ethernet/cavium/liquidio/octeon_main.h

@@ -144,7 +144,7 @@ static inline int

 sleep_cond(wait_queue_head_t *wait_queue, int *condition)

 {

 	int errno = 0;

-	wait_queue_t we;

+	wait_queue_entry_t we;

 	init_waitqueue_entry(&we, current);

 	add_wait_queue(wait_queue, &we);

@@ -171,7 +171,7 @@ sleep_timeout_cond(wait_queue_head_t *wa

 		   int *condition,

 		   int timeout)

 {

-	wait_queue_t we;

+	wait_queue_entry_t we;

 	init_waitqueue_entry(&we, current);

 	add_wait_queue(wait_queue, &we);

--- a/drivers/net/wireless/cisco/airo.c

+++ b/drivers/net/wireless/cisco/airo.c

@@ -3066,7 +3066,7 @@ static int airo_thread(void *data) {

 		if (ai->jobs) {

 			locked = down_interruptible(&ai->sem);

 		} else {

-			wait_queue_t wait;

+			wait_queue_entry_t wait;

 			init_waitqueue_entry(&wait, current);

 			add_wait_queue(&ai->thr_wait, &wait);

--- a/drivers/net/wireless/intersil/hostap/hostap_ioctl.c

+++ b/drivers/net/wireless/intersil/hostap/hostap_ioctl.c

@@ -2544,7 +2544,7 @@ static int prism2_ioctl_priv_prism2_para

 			ret = -EINVAL;

 		}

 		if (local->iw_mode == IW_MODE_MASTER) {

-			wait_queue_t __wait;

+			wait_queue_entry_t __wait;

 			init_waitqueue_entry(&__wait, current);

 			add_wait_queue(&local->hostscan_wq, &__wait);

 			set_current_state(TASK_INTERRUPTIBLE);

--- a/drivers/net/wireless/marvell/libertas/main.c

+++ b/drivers/net/wireless/marvell/libertas/main.c

@@ -453,7 +453,7 @@ static int lbs_thread(void *data)

 {

 	struct net_device *dev = data;

 	struct lbs_private *priv = dev->ml_priv;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	lbs_deb_enter(LBS_DEB_THREAD);

--- a/drivers/scsi/dpt/dpti_i2o.h

+++ b/drivers/scsi/dpt/dpti_i2o.h

@@ -48,7 +48,7 @@

 #include <linux/wait.h>

 typedef wait_queue_head_t adpt_wait_queue_head_t;

 #define ADPT_DECLARE_WAIT_QUEUE_HEAD(wait) DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wait)

-typedef wait_queue_t adpt_wait_queue_t;

+typedef wait_queue_entry_t adpt_wait_queue_entry_t;

 /*

  * message structures

--- a/drivers/scsi/ips.c

+++ b/drivers/scsi/ips.c

@@ -301,13 +301,13 @@ static uint32_t ips_statupd_copperhead_m

 static uint32_t ips_statupd_morpheus(ips_ha_t *);

 static ips_scb_t *ips_getscb(ips_ha_t *);

 static void ips_putq_scb_head(ips_scb_queue_t *, ips_scb_t *);

-static void ips_putq_wait_tail(ips_wait_queue_t *, struct scsi_cmnd *);

+static void ips_putq_wait_tail(ips_wait_queue_entry_t *, struct scsi_cmnd *);

 static void ips_putq_copp_tail(ips_copp_queue_t *,

 				      ips_copp_wait_item_t *);

 static ips_scb_t *ips_removeq_scb_head(ips_scb_queue_t *);

 static ips_scb_t *ips_removeq_scb(ips_scb_queue_t *, ips_scb_t *);

-static struct scsi_cmnd *ips_removeq_wait_head(ips_wait_queue_t *);

-static struct scsi_cmnd *ips_removeq_wait(ips_wait_queue_t *,

+static struct scsi_cmnd *ips_removeq_wait_head(ips_wait_queue_entry_t *);

+static struct scsi_cmnd *ips_removeq_wait(ips_wait_queue_entry_t *,

 					  struct scsi_cmnd *);

 static ips_copp_wait_item_t *ips_removeq_copp(ips_copp_queue_t *,

 						     ips_copp_wait_item_t *);

@@ -2871,7 +2871,7 @@ ips_removeq_scb(ips_scb_queue_t * queue,

 /* ASSUMED to be called from within the HA lock                             */

 /*                                                                          */

 /****************************************************************************/

-static void ips_putq_wait_tail(ips_wait_queue_t *queue, struct scsi_cmnd *item)

+static void ips_putq_wait_tail(ips_wait_queue_entry_t *queue, struct scsi_cmnd *item)

 {

 	METHOD_TRACE("ips_putq_wait_tail", 1);

@@ -2902,7 +2902,7 @@ static void ips_putq_wait_tail(ips_wait_

 /* ASSUMED to be called from within the HA lock                             */

 /*                                                                          */

 /****************************************************************************/

-static struct scsi_cmnd *ips_removeq_wait_head(ips_wait_queue_t *queue)

+static struct scsi_cmnd *ips_removeq_wait_head(ips_wait_queue_entry_t *queue)

 {

 	struct scsi_cmnd *item;

@@ -2936,7 +2936,7 @@ static struct scsi_cmnd *ips_removeq_wai

 /* ASSUMED to be called from within the HA lock                             */

 /*                                                                          */

 /****************************************************************************/

-static struct scsi_cmnd *ips_removeq_wait(ips_wait_queue_t *queue,

+static struct scsi_cmnd *ips_removeq_wait(ips_wait_queue_entry_t *queue,

 					  struct scsi_cmnd *item)

 {

 	struct scsi_cmnd *p;

--- a/drivers/scsi/ips.h

+++ b/drivers/scsi/ips.h

@@ -989,7 +989,7 @@ typedef struct ips_wait_queue {

 	struct scsi_cmnd *head;

 	struct scsi_cmnd *tail;

 	int count;

-} ips_wait_queue_t;

+} ips_wait_queue_entry_t;

 typedef struct ips_copp_wait_item {

 	struct scsi_cmnd *scsi_cmd;

@@ -1035,7 +1035,7 @@ typedef struct ips_ha {

    ips_stat_t         sp;                 /* Status packer pointer      */

    struct ips_scb    *scbs;               /* Array of all CCBS          */

    struct ips_scb    *scb_freelist;       /* SCB free list              */

-   ips_wait_queue_t   scb_waitlist;       /* Pending SCB list           */

+   ips_wait_queue_entry_t   scb_waitlist;       /* Pending SCB list           */

    ips_copp_queue_t   copp_waitlist;      /* Pending PT list            */

    ips_scb_queue_t    scb_activelist;     /* Active SCB list            */

    IPS_IO_CMD        *dummy;              /* dummy command              */

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

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

@@ -3278,7 +3278,7 @@ int

 kiblnd_connd(void *arg)

 {

 	spinlock_t *lock = &kiblnd_data.kib_connd_lock;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	unsigned long flags;

 	struct kib_conn *conn;

 	int timeout;

@@ -3532,7 +3532,7 @@ kiblnd_scheduler(void *arg)

 	long id = (long)arg;

 	struct kib_sched_info *sched;

 	struct kib_conn *conn;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	unsigned long flags;

 	struct ib_wc wc;

 	int did_something;

@@ -3667,7 +3667,7 @@ kiblnd_failover_thread(void *arg)

 {

 	rwlock_t *glock = &kiblnd_data.kib_global_lock;

 	struct kib_dev *dev;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	unsigned long flags;

 	int rc;

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

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

@@ -2166,7 +2166,7 @@ ksocknal_connd(void *arg)

 {

 	spinlock_t *connd_lock = &ksocknal_data.ksnd_connd_lock;

 	struct ksock_connreq *cr;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	int nloops = 0;

 	int cons_retry = 0;

@@ -2554,7 +2554,7 @@ ksocknal_check_peer_timeouts(int idx)

 int

 ksocknal_reaper(void *arg)

 {

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	struct ksock_conn *conn;

 	struct ksock_sched *sched;

 	struct list_head enomem_conns;

--- a/drivers/staging/lustre/lnet/libcfs/debug.c

+++ b/drivers/staging/lustre/lnet/libcfs/debug.c

@@ -361,7 +361,7 @@ static int libcfs_debug_dumplog_thread(v

 void libcfs_debug_dumplog(void)

 {

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	struct task_struct *dumper;

 	/* we're being careful to ensure that the kernel thread is

--- a/drivers/staging/lustre/lnet/libcfs/tracefile.c

+++ b/drivers/staging/lustre/lnet/libcfs/tracefile.c

@@ -990,7 +990,7 @@ static int tracefiled(void *arg)

 	complete(&tctl->tctl_start);

 	while (1) {

-		wait_queue_t __wait;

+		wait_queue_entry_t __wait;

 		pc.pc_want_daemon_pages = 0;

 		collect_pages(&pc);

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

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

@@ -312,7 +312,7 @@ __must_hold(&the_lnet.ln_eq_wait_lock)

 {

 	int tms = *timeout_ms;

 	int wait;

-	wait_queue_t wl;

+	wait_queue_entry_t wl;

 	unsigned long now;

 	if (!tms)

--- a/drivers/staging/lustre/lnet/lnet/lib-socket.c

+++ b/drivers/staging/lustre/lnet/lnet/lib-socket.c

@@ -516,7 +516,7 @@ lnet_sock_listen(struct socket **sockp,

 int

 lnet_sock_accept(struct socket **newsockp, struct socket *sock)

 {

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	struct socket *newsock;

 	int rc;

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

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

@@ -192,7 +192,7 @@ static int seq_client_alloc_seq(const st

 }

 static int seq_fid_alloc_prep(struct lu_client_seq *seq,

-			      wait_queue_t *link)

+			      wait_queue_entry_t *link)

 {

 	if (seq->lcs_update) {

 		add_wait_queue(&seq->lcs_waitq, link);

@@ -223,7 +223,7 @@ static void seq_fid_alloc_fini(struct lu

 int seq_client_alloc_fid(const struct lu_env *env,

 			 struct lu_client_seq *seq, struct lu_fid *fid)

 {

-	wait_queue_t link;

+	wait_queue_entry_t link;

 	int rc;

 	LASSERT(seq);

@@ -290,7 +290,7 @@ EXPORT_SYMBOL(seq_client_alloc_fid);

  */

 void seq_client_flush(struct lu_client_seq *seq)

 {

-	wait_queue_t link;

+	wait_queue_entry_t link;

 	LASSERT(seq);

 	init_waitqueue_entry(&link, current);

--- a/drivers/staging/lustre/lustre/include/lustre_lib.h

+++ b/drivers/staging/lustre/lustre/include/lustre_lib.h

@@ -201,7 +201,7 @@ struct l_wait_info {

 			   sigmask(SIGALRM))

 /**

- * wait_queue_t of Linux (version < 2.6.34) is a FIFO list for exclusively

+ * wait_queue_entry_t of Linux (version < 2.6.34) is a FIFO list for exclusively

  * waiting threads, which is not always desirable because all threads will

  * be waken up again and again, even user only needs a few of them to be

  * active most time. This is not good for performance because cache can

@@ -228,7 +228,7 @@ struct l_wait_info {

  */

 #define __l_wait_event(wq, condition, info, ret, l_add_wait)		   \

 do {									   \

-	wait_queue_t __wait;						 \

+	wait_queue_entry_t __wait;						 \

 	long __timeout = info->lwi_timeout;			  \

 	sigset_t   __blocked;					      \

 	int   __allow_intr = info->lwi_allow_intr;			     \

--- a/drivers/staging/lustre/lustre/llite/lcommon_cl.c

+++ b/drivers/staging/lustre/lustre/llite/lcommon_cl.c

@@ -207,7 +207,7 @@ int cl_file_inode_init(struct inode *ino

 static void cl_object_put_last(struct lu_env *env, struct cl_object *obj)

 {

 	struct lu_object_header *header = obj->co_lu.lo_header;

-	wait_queue_t	   waiter;

+	wait_queue_entry_t	   waiter;

 	if (unlikely(atomic_read(&header->loh_ref) != 1)) {

 		struct lu_site *site = obj->co_lu.lo_dev->ld_site;

--- a/drivers/staging/lustre/lustre/lov/lov_cl_internal.h

+++ b/drivers/staging/lustre/lustre/lov/lov_cl_internal.h

@@ -370,7 +370,7 @@ struct lov_thread_info {

 	struct ost_lvb	  lti_lvb;

 	struct cl_2queue	lti_cl2q;

 	struct cl_page_list     lti_plist;

-	wait_queue_t	  lti_waiter;

+	wait_queue_entry_t	  lti_waiter;

 	struct cl_attr          lti_attr;

 };

--- a/drivers/staging/lustre/lustre/lov/lov_object.c

+++ b/drivers/staging/lustre/lustre/lov/lov_object.c

@@ -371,7 +371,7 @@ static void lov_subobject_kill(const str

 	struct lov_layout_raid0 *r0;

 	struct lu_site	  *site;

 	struct lu_site_bkt_data *bkt;

-	wait_queue_t	  *waiter;

+	wait_queue_entry_t	  *waiter;

 	r0  = &lov->u.raid0;

 	LASSERT(r0->lo_sub[idx] == los);

--- a/drivers/staging/lustre/lustre/obdclass/lu_object.c

+++ b/drivers/staging/lustre/lustre/obdclass/lu_object.c

@@ -556,7 +556,7 @@ EXPORT_SYMBOL(lu_object_print);

 static struct lu_object *htable_lookup(struct lu_site *s,

 				       struct cfs_hash_bd *bd,

 				       const struct lu_fid *f,

-				       wait_queue_t *waiter,

+				       wait_queue_entry_t *waiter,

 				       __u64 *version)

 {

 	struct lu_site_bkt_data *bkt;

@@ -670,7 +670,7 @@ static struct lu_object *lu_object_find_

 					    struct lu_device *dev,

 					    const struct lu_fid *f,

 					    const struct lu_object_conf *conf,

-					    wait_queue_t *waiter)

+					    wait_queue_entry_t *waiter)

 {

 	struct lu_object      *o;

 	struct lu_object      *shadow;

@@ -750,7 +750,7 @@ struct lu_object *lu_object_find_at(cons

 {

 	struct lu_site_bkt_data *bkt;

 	struct lu_object	*obj;

-	wait_queue_t	   wait;

+	wait_queue_entry_t	   wait;

 	while (1) {

 		obj = lu_object_find_try(env, dev, f, conf, &wait);

--- a/drivers/tty/synclink_gt.c

+++ b/drivers/tty/synclink_gt.c

@@ -184,7 +184,7 @@ static void hdlcdev_exit(struct slgt_inf

 struct cond_wait {

 	struct cond_wait *next;

 	wait_queue_head_t q;

-	wait_queue_t wait;

+	wait_queue_entry_t wait;

 	unsigned int data;

 };

 static void init_cond_wait(struct cond_wait *w, unsigned int data);

--- a/drivers/vfio/virqfd.c

+++ b/drivers/vfio/virqfd.c

@@ -43,7 +43,7 @@ static void virqfd_deactivate(struct vir

 	queue_work(vfio_irqfd_cleanup_wq, &virqfd->shutdown);

 }

-static int virqfd_wakeup(wait_queue_t *wait, unsigned mode, int sync, void *key)

+static int virqfd_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync, void *key)

 {

 	struct virqfd *virqfd = container_of(wait, struct virqfd, wait);

 	unsigned long flags = (unsigned long)key;

--- a/drivers/vhost/vhost.c

+++ b/drivers/vhost/vhost.c

@@ -165,7 +165,7 @@ static void vhost_poll_func(struct file

 	add_wait_queue(wqh, &poll->wait);

 }

-static int vhost_poll_wakeup(wait_queue_t *wait, unsigned mode, int sync,

+static int vhost_poll_wakeup(wait_queue_entry_t *wait, unsigned mode, int sync,

 			     void *key)

 {

 	struct vhost_poll *poll = container_of(wait, struct vhost_poll, wait);

--- a/drivers/vhost/vhost.h

+++ b/drivers/vhost/vhost.h

@@ -31,7 +31,7 @@ struct vhost_work {

 struct vhost_poll {

 	poll_table                table;

 	wait_queue_head_t        *wqh;

-	wait_queue_t              wait;

+	wait_queue_entry_t              wait;

 	struct vhost_work	  work;

 	unsigned long		  mask;

 	struct vhost_dev	 *dev;

--- a/fs/autofs4/autofs_i.h

+++ b/fs/autofs4/autofs_i.h

@@ -83,7 +83,7 @@ struct autofs_info {

 struct autofs_wait_queue {

 	wait_queue_head_t queue;

 	struct autofs_wait_queue *next;

-	autofs_wqt_t wait_queue_token;

+	autofs_wqt_t wait_queue_entry_token;

 	/* We use the following to see what we are waiting for */

 	struct qstr name;

 	u32 dev;

--- a/fs/autofs4/waitq.c

+++ b/fs/autofs4/waitq.c

@@ -104,7 +104,7 @@ static void autofs4_notify_daemon(struct

 	size_t pktsz;

 	pr_debug("wait id = 0x%08lx, name = %.*s, type=%d\n",

-		 (unsigned long) wq->wait_queue_token,

+		 (unsigned long) wq->wait_queue_entry_token,

 		 wq->name.len, wq->name.name, type);

 	memset(&pkt, 0, sizeof(pkt)); /* For security reasons */

@@ -120,7 +120,7 @@ static void autofs4_notify_daemon(struct

 		pktsz = sizeof(*mp);

-		mp->wait_queue_token = wq->wait_queue_token;

+		mp->wait_queue_entry_token = wq->wait_queue_entry_token;

 		mp->len = wq->name.len;

 		memcpy(mp->name, wq->name.name, wq->name.len);

 		mp->name[wq->name.len] = '\0';

@@ -133,7 +133,7 @@ static void autofs4_notify_daemon(struct

 		pktsz = sizeof(*ep);

-		ep->wait_queue_token = wq->wait_queue_token;

+		ep->wait_queue_entry_token = wq->wait_queue_entry_token;

 		ep->len = wq->name.len;

 		memcpy(ep->name, wq->name.name, wq->name.len);

 		ep->name[wq->name.len] = '\0';

@@ -153,7 +153,7 @@ static void autofs4_notify_daemon(struct

 		pktsz = sizeof(*packet);

-		packet->wait_queue_token = wq->wait_queue_token;

+		packet->wait_queue_entry_token = wq->wait_queue_entry_token;

 		packet->len = wq->name.len;

 		memcpy(packet->name, wq->name.name, wq->name.len);

 		packet->name[wq->name.len] = '\0';

@@ -428,7 +428,7 @@ int autofs4_wait(struct autofs_sb_info *

 			return -ENOMEM;

 		}

-		wq->wait_queue_token = autofs4_next_wait_queue;

+		wq->wait_queue_entry_token = autofs4_next_wait_queue;

 		if (++autofs4_next_wait_queue == 0)

 			autofs4_next_wait_queue = 1;

 		wq->next = sbi->queues;

@@ -461,7 +461,7 @@ int autofs4_wait(struct autofs_sb_info *

 		}

 		pr_debug("new wait id = 0x%08lx, name = %.*s, nfy=%d\n",

-			 (unsigned long) wq->wait_queue_token, wq->name.len,

+			 (unsigned long) wq->wait_queue_entry_token, wq->name.len,

 			 wq->name.name, notify);

 		/*

@@ -471,7 +471,7 @@ int autofs4_wait(struct autofs_sb_info *

 	} else {

 		wq->wait_ctr++;

 		pr_debug("existing wait id = 0x%08lx, name = %.*s, nfy=%d\n",

-			 (unsigned long) wq->wait_queue_token, wq->name.len,

+			 (unsigned long) wq->wait_queue_entry_token, wq->name.len,

 			 wq->name.name, notify);

 		mutex_unlock(&sbi->wq_mutex);

 		kfree(qstr.name);

@@ -550,13 +550,13 @@ int autofs4_wait(struct autofs_sb_info *

 }

-int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_token, int status)

+int autofs4_wait_release(struct autofs_sb_info *sbi, autofs_wqt_t wait_queue_entry_token, int status)

 {

 	struct autofs_wait_queue *wq, **wql;

 	mutex_lock(&sbi->wq_mutex);

 	for (wql = &sbi->queues; (wq = *wql) != NULL; wql = &wq->next) {

-		if (wq->wait_queue_token == wait_queue_token)

+		if (wq->wait_queue_entry_token == wait_queue_entry_token)