From: Maxim Levitsky <maximlevitsky@gmail.com>
To: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Alex Dubov <oakad@yahoo.com>, joern <joern@logfs.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
linux-mtd <linux-mtd@lists.infradead.org>,
Thomas Gleixner <tglx@linutronix.de>,
David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH 2/8] blktrans: track open and close calls.
Date: Sat, 23 Jan 2010 02:21:32 +0200 [thread overview]
Message-ID: <1264206092.31827.6.camel@maxim-laptop> (raw)
In-Reply-To: <1264205925.31827.3.camel@maxim-laptop>
>From 1ed89e9f7355284eaebbacb1d083e3bbd54aa3bc Mon Sep 17 00:00:00 2001
From: Maxim Levitsky <maximlevitsky@gmail.com>
Date: Sat, 23 Jan 2010 02:03:13 +0200
Subject: [PATCH 2/8] blktrans: track open and close calls.
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 <maximlevitsky@gmail.com>
---
drivers/mtd/mtd_blkdevs.c | 19 +++++++++++++++++++
include/linux/mtd/blktrans.h | 1 +
2 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 3d9802e..c2d97a0 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,10 @@ static int blktrans_release(struct gendisk *disk, fmode_t mode)
struct mtd_blktrans_ops *tr = dev->tr;
int ret = 0;
+ dev->open--;
+ if (dev->open)
+ return 0;
+
if (tr->release)
ret = tr->release(dev);
@@ -304,6 +311,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;
@@ -332,6 +340,17 @@ 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;
--
1.6.3.3
next prev parent reply other threads:[~2010-01-23 0:21 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-23 0:18 [PATCH 0/8] Cleanups for mtd translation layer (broken up) Maxim Levitsky
2010-01-23 0:19 ` [PATCH 1/8] blktrans: nuke mtd_blkcore_priv and make both thread and disk queue be per device Maxim Levitsky
2010-01-23 0:21 ` Maxim Levitsky [this message]
2010-01-23 0:23 ` [PATCH 3/8] blktrans: don't free mtd_blktrans_dev, core will do that for you Maxim Levitsky
2010-01-23 0:23 ` [PATCH 4/8] MTD: create lockless versions of {get,put}_mtd_device Maxim Levitsky
2010-01-23 0:24 ` [PATCH 5/8] blktrans: add proper locking Maxim Levitsky
2010-01-23 0:24 ` [PATCH 6/8] blktrans: flush all requests before we remove the device Maxim Levitsky
2010-01-23 0:25 ` [PATCH 7/8] MTD: call remove notifiers before removing " Maxim Levitsky
2010-01-23 0:26 ` [PATCH 8/8] MTD: make mtdtrans thread freezeable Maxim Levitsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1264206092.31827.6.camel@maxim-laptop \
--to=maximlevitsky@gmail.com \
--cc=dedekind1@gmail.com \
--cc=dwmw2@infradead.org \
--cc=joern@logfs.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=oakad@yahoo.com \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox