From patchwork Tue Feb 9 16:57:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 44935 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 7D0ACB7D16 for ; Wed, 10 Feb 2010 04:02:07 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NetPj-0003BE-JR; Tue, 09 Feb 2010 16:58:15 +0000 Received: from mail-bw0-f220.google.com ([209.85.218.220]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NetPY-000351-MO for linux-mtd@lists.infradead.org; Tue, 09 Feb 2010 16:58:13 +0000 Received: by bwz20 with SMTP id 20so2398617bwz.20 for ; Tue, 09 Feb 2010 08:58:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=UgOoIQRieTUMcqfXo3rQwBHDHVb7QgVaZHaXYBr8rsE=; b=YdKZmv38auC9Oxrb4crIgI0/YBusQ2Lz0Q0CcoZ+5JmfWg3AQNU83wiIbDw/RjhPAw jkZk47AJZSpAw/0jZjgOIzoDEO5BIFG4jSxZ8+PkEVFFbLpjpPI1l/VQfiNWfmFDZuPq 8z+T2oCQHMbBWPKjnt5/r2UqYVl9Po2A0oG58= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=nEeFlk79t/VLiZo5ObUgy2MOd6VuknNNmZulO3jVOBOzTaDrQXVLlcA6u5QfJpoxoX 1XPfjC/hq0bWPjbsEQo2WndP8ikbu2lsA8HCK4gRDeBepN+UPzVDKkdQMxVFLzEdtGGM IsdR4kQQ93ybvRR8bO0JsY79pFPBCAgLKHtbI= Received: by 10.204.48.214 with SMTP id s22mr4499592bkf.117.1265734683936; Tue, 09 Feb 2010 08:58:03 -0800 (PST) Received: from localhost.localdomain (87.68.240.235.adsl.012.net.il [87.68.240.235]) by mx.google.com with ESMTPS id 16sm127734bwz.7.2010.02.09.08.58.01 (version=SSLv3 cipher=RC4-MD5); Tue, 09 Feb 2010 08:58:03 -0800 (PST) From: Maxim Levitsky To: David Woodhouse Subject: [PATCH 03/17] blktrans: track open and close calls. Date: Tue, 9 Feb 2010 18:57:31 +0200 Message-Id: <1265734665-22656-4-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1265734665-22656-1-git-send-email-maximlevitsky@gmail.com> References: <1265734665-22656-1-git-send-email-maximlevitsky@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100209_115804_852066_11B88C34 X-CRM114-Status: GOOD ( 20.95 ) 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: Maxim Levitsky , Alex Dubov , Artem Bityutskiy , joern , Vitaly Wool , linux-kernel , "stanley.miao" , linux-mtd , Thomas Gleixner 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: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch adds tracking for open and close calls. Now trans ->open and ->release are never called twise in a row ->release is also called once before mtd device disappers Proper locking will be added in follow up patch Signed-off-by: Maxim Levitsky --- drivers/mtd/mtd_blkdevs.c | 17 +++++++++++++++++ include/linux/mtd/blktrans.h | 1 + 2 files changed, 18 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 93c87af..9ac8f22 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c @@ -128,6 +128,9 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) if (!get_mtd_device(NULL, dev->mtd->index)) goto out; + if (dev->open++) + goto out; + if (!try_module_get(tr->owner)) goto out_tr; @@ -153,6 +156,9 @@ static int blktrans_release(struct gendisk *disk, fmode_t mode) struct mtd_blktrans_ops *tr = dev->tr; int ret = 0; + if (--dev->open) + return 0; + if (tr->release) ret = tr->release(dev); @@ -304,6 +310,7 @@ int add_mtd_blktrans_dev(struct mtd_blktrans_dev *new) if (new->readonly) set_disk_ro(gd, 1); + new->open = 0; add_disk(gd); return 0; @@ -333,6 +340,16 @@ int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old) /* Stop the thread */ kthread_stop(old->thread); + if (old->open) { + if (old->tr->release) + old->tr->release(old); + put_mtd_device(old->mtd); + } + + /* From now on, no calls into trans can be made */ + /* Mtd device will be gone real soon now */ + old->mtd = NULL; + blk_cleanup_queue(old->rq); return 0; } diff --git a/include/linux/mtd/blktrans.h b/include/linux/mtd/blktrans.h index a4b3928..507f7b2 100644 --- a/include/linux/mtd/blktrans.h +++ b/include/linux/mtd/blktrans.h @@ -24,6 +24,7 @@ struct mtd_blktrans_dev { int devnum; unsigned long size; int readonly; + int open; struct gendisk *disk; struct task_struct *thread; struct request_queue *rq;