Re: [PATCH 5/6] workqueue: deprecate system_nrt[_freezable]_wq

[Lai Jiangshan <laijs@cn.fujitsu.com>]

On 08/14/2012 09:49 AM, Tejun Heo wrote:
> system_nrt[_freezable]_wq are now spurious.  Mark them deprecated and
> convert all users to system[_freezable]_wq.
> 
> If you're cc'd and wondering what's going on: Now all workqueues are
> non-reentrant, so there's no reason to use system_nrt[_freezable]_wq.
> Please use system[_freezable]_wq instead.
> 
> This patch doesn't make any functional difference.
> 
> Signed-off-by: Tejun Heo <tj@kernel.org>
> Cc: Jens Axboe <axboe@kernel.dk>
> Cc: David Airlie <airlied@linux.ie>
> Cc: Jiri Kosina <jkosina@suse.cz>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
> Cc: David Howells <dhowells@redhat.com>
> ---
>  block/blk-throttle.c              |    7 +++----
>  block/genhd.c                     |   10 +++++-----
>  drivers/gpu/drm/drm_crtc_helper.c |    6 +++---
>  drivers/hid/hid-wiimote-ext.c     |    2 +-
>  drivers/mmc/core/host.c           |    4 ++--
>  drivers/net/virtio_net.c          |   12 ++++++------
>  include/linux/workqueue.h         |    4 ++--
>  kernel/srcu.c                     |    4 ++--
>  security/keys/gc.c                |    8 ++++----
>  security/keys/key.c               |    2 +-
>  10 files changed, 29 insertions(+), 30 deletions(-)



> diff --git a/kernel/srcu.c b/kernel/srcu.c
> index 2095be3..97c465e 100644
> --- a/kernel/srcu.c
> +++ b/kernel/srcu.c
> @@ -379,7 +379,7 @@ void call_srcu(struct srcu_struct *sp, struct rcu_head *head,
>  	rcu_batch_queue(&sp->batch_queue, head);
>  	if (!sp->running) {
>  		sp->running = true;
> -		queue_delayed_work(system_nrt_wq, &sp->work, 0);
> +		schedule_delayed_work(&sp->work, 0);
>  	}
>  	spin_unlock_irqrestore(&sp->queue_lock, flags);
>  }
> @@ -631,7 +631,7 @@ static void srcu_reschedule(struct srcu_struct *sp)
>  	}
>  
>  	if (pending)
> -		queue_delayed_work(system_nrt_wq, &sp->work, SRCU_INTERVAL);
> +		schedule_delayed_work(&sp->work, SRCU_INTERVAL);
>  }
>  
>  /*


Acked-By: Lai Jiangshan <laijs@cn.fujitsu.com>