From patchwork Wed Jan 6 21:48:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 42334 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id AEA81B6F01 for ; Thu, 7 Jan 2010 08:50:13 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NSdjj-0005au-K8; Wed, 06 Jan 2010 21:48:15 +0000 Received: from mail-fx0-f222.google.com ([209.85.220.222]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NSdjd-0005LQ-7R for linux-mtd@lists.infradead.org; Wed, 06 Jan 2010 21:48:13 +0000 Received: by fxm22 with SMTP id 22so20326760fxm.2 for ; Wed, 06 Jan 2010 13:48:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=Z21CqTsQJ7TBGZYY31XndZc8kYRzVR+zyvCyxCCtpbs=; b=Dp+VpgoP9Ulb+LeKt/WHGnwCHE7FBuo1pW6tcaUOam4ZGoPypMzYchO8ge5X34ersw alBzzWeX6qCoDp+P4DiSEHTL8/ZxzpuZ9n3YYzMKzZhWdcX3faWOzRDbrzN/uqHYC72E 9qwgGVQT6EYdYbXS5hm5Ua2JEBu41ylDlsaM0= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=sYPBoAi1OaceDTdqHsuceViE7qH/qGCqBq7ZwvUGPFXVZeOQZhpzZ/OjXZU/bnxyzQ +vTHtCw4+IV2/rxuvzUFiwTw21M80HJD3kXr3UcvEJuKs4U0eXgxOicoLz8JJT5cFBZj lyLDtau1ZEO156rJM+uwUOipp4sCe3Wc3mwRE= Received: by 10.223.14.13 with SMTP id e13mr1765769faa.85.1262814488503; Wed, 06 Jan 2010 13:48:08 -0800 (PST) Received: from ?10.1.0.2? (IGLD-84-228-118-133.inter.net.il [84.228.118.133]) by mx.google.com with ESMTPS id h2sm1555745fkh.2.2010.01.06.13.48.07 (version=SSLv3 cipher=RC4-MD5); Wed, 06 Jan 2010 13:48:08 -0800 (PST) Subject: [PATCH 4/9] mtd-make mtdtrans thread suspend friendly From: Maxim Levitsky To: linux-kernel In-Reply-To: <1262814216.14552.22.camel@maxim-laptop> References: <1262814216.14552.22.camel@maxim-laptop> Date: Wed, 06 Jan 2010 23:48:05 +0200 Message-ID: <1262814485.14552.27.camel@maxim-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100106_164809_380573_B9972744 X-CRM114-Status: GOOD ( 13.30 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- _SUMMARY_ Cc: joern , linux-mtd , Alex Dubov X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org >From 23892d5e002d63b7980742fa5445443547fcf8cf Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Tue, 5 Jan 2010 23:25:19 +0200 Subject: [PATCH 4/9] mtd-make mtdtrans thread suspend friendly Signed-of-by: Maxim Levitsky --- drivers/mtd/mtd_blkdevs.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 6af4673..7070d35 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "mtdcore.h" @@ -79,37 +80,35 @@ static int mtd_blktrans_thread(void *arg) /* we might get involved when memory gets low, so use PF_MEMALLOC */ current->flags |= PF_MEMALLOC; - - spin_lock_irq(rq->queue_lock); + set_freezable(); while (!kthread_should_stop()) { int res; + try_to_freeze(); + + spin_lock_irq(rq->queue_lock); if (!req && !(req = blk_fetch_request(rq))) { set_current_state(TASK_INTERRUPTIBLE); spin_unlock_irq(rq->queue_lock); schedule(); - spin_lock_irq(rq->queue_lock); continue; } - spin_unlock_irq(rq->queue_lock); + mutex_lock(&dev->lock); res = do_blktrans_request(dev->tr, dev, req); mutex_unlock(&dev->lock); spin_lock_irq(rq->queue_lock); - if (!__blk_end_request_cur(req, res)) req = NULL; + spin_unlock_irq(rq->queue_lock); } if (req) __blk_end_request_all(req, -EIO); - - spin_unlock_irq(rq->queue_lock); - return 0; }