From patchwork Sun Jul 22 17:22:32 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tejun Heo X-Patchwork-Id: 1224901 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D89433FCFC for ; Sun, 22 Jul 2012 17:22:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752321Ab2GVRWj (ORCPT ); Sun, 22 Jul 2012 13:22:39 -0400 Received: from mail-pb0-f46.google.com ([209.85.160.46]:56623 "EHLO mail-pb0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752308Ab2GVRWi (ORCPT ); Sun, 22 Jul 2012 13:22:38 -0400 Received: by pbbrp8 with SMTP id rp8so9467502pbb.19 for ; Sun, 22 Jul 2012 10:22:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=w7L5+pmz1Udj1D+1ckieV8o2ezYxiVWUhOTmh1RKcN8=; b=JHXFmRGn1M+b2vE8CrKypJmlXd9397melyG2eKPZWT7AK2cY22FcvQaSW0cJca3ARI wiarP2INCUaPSMOWICMYnHGXDVx5gVM7zD50E1kD5/90N72cCH77mEwvvrEa76ybZdR9 BVWaJfV/Q9f4u9rDHY2ChSYM8gH/EV0E1FAxsC6MRkJwImdJtI10dFrNzPvyP5O+Ke2I 9JgIMnYo1xwO8arj2jrH2blFZV12Tl0TjDX//ZN8kXtrQOdPriWxamomTSiWBBNM1WbM gGooUU5KlkI0brXPs6scRzxHw8z5QjBIc8BtnqLieGGBkSXhI46QicG2EAt7hCq6MZ0z 0gTQ== Received: by 10.68.229.33 with SMTP id sn1mr29150438pbc.9.1342977757472; Sun, 22 Jul 2012 10:22:37 -0700 (PDT) Received: from dhcp-172-17-108-109.mtv.corp.google.com ([216.239.45.130]) by mx.google.com with ESMTPS id ka5sm8225540pbb.37.2012.07.22.10.22.34 (version=SSLv3 cipher=OTHER); Sun, 22 Jul 2012 10:22:36 -0700 (PDT) Date: Sun, 22 Jul 2012 10:22:32 -0700 From: Tejun Heo To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Avi Kivity , kvm@vger.kernel.org, Andy Walls , ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org, Grant Likely , spi-devel-general@lists.sourceforge.net, Linus Torvalds Subject: [PATCH UPDATED 1/2] kthread_worker: reorganize to prepare for flush_kthread_work() reimplementation Message-ID: <20120722172232.GD5144@dhcp-172-17-108-109.mtv.corp.google.com> References: <20120719211510.GA32763@google.com> <20120719211541.GB32763@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20120719211541.GB32763@google.com> User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From 9a2e03d8ed518a61154f18d83d6466628e519f94 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 19 Jul 2012 13:52:53 -0700 Make the following two non-functional changes. * Separate out insert_kthread_work() from queue_kthread_work(). * Relocate struct kthread_flush_work and kthread_flush_work_fn() definitions above flush_kthread_work(). v2: Added lockdep_assert_held() in insert_kthread_work() as suggested by Andy Walls. Signed-off-by: Tejun Heo Acked-by: Andy Walls --- kernel/kthread.c | 42 ++++++++++++++++++++++++++---------------- 1 files changed, 26 insertions(+), 16 deletions(-) diff --git a/kernel/kthread.c b/kernel/kthread.c index 3d3de63..4bfbff3 100644 --- a/kernel/kthread.c +++ b/kernel/kthread.c @@ -378,6 +378,19 @@ repeat: } EXPORT_SYMBOL_GPL(kthread_worker_fn); +/* insert @work before @pos in @worker */ +static void insert_kthread_work(struct kthread_worker *worker, + struct kthread_work *work, + struct list_head *pos) +{ + lockdep_assert_held(&worker->lock); + + list_add_tail(&work->node, pos); + work->queue_seq++; + if (likely(worker->task)) + wake_up_process(worker->task); +} + /** * queue_kthread_work - queue a kthread_work * @worker: target kthread_worker @@ -395,10 +408,7 @@ bool queue_kthread_work(struct kthread_worker *worker, spin_lock_irqsave(&worker->lock, flags); if (list_empty(&work->node)) { - list_add_tail(&work->node, &worker->work_list); - work->queue_seq++; - if (likely(worker->task)) - wake_up_process(worker->task); + insert_kthread_work(worker, work, &worker->work_list); ret = true; } spin_unlock_irqrestore(&worker->lock, flags); @@ -406,6 +416,18 @@ bool queue_kthread_work(struct kthread_worker *worker, } EXPORT_SYMBOL_GPL(queue_kthread_work); +struct kthread_flush_work { + struct kthread_work work; + struct completion done; +}; + +static void kthread_flush_work_fn(struct kthread_work *work) +{ + struct kthread_flush_work *fwork = + container_of(work, struct kthread_flush_work, work); + complete(&fwork->done); +} + /** * flush_kthread_work - flush a kthread_work * @work: work to flush @@ -436,18 +458,6 @@ void flush_kthread_work(struct kthread_work *work) } EXPORT_SYMBOL_GPL(flush_kthread_work); -struct kthread_flush_work { - struct kthread_work work; - struct completion done; -}; - -static void kthread_flush_work_fn(struct kthread_work *work) -{ - struct kthread_flush_work *fwork = - container_of(work, struct kthread_flush_work, work); - complete(&fwork->done); -} - /** * flush_kthread_worker - flush all current works on a kthread_worker * @worker: worker to flush