From: Fubo Chen <fubo.chen@gmail.com>
To: linux-mtd@lists.infradead.org
Cc: David Woodhouse <dwmw2@infradead.org>
Subject: [PATCH] mtd: Fix memory leak triggered by removal
Date: Sat, 25 Feb 2012 16:57:22 +0000 [thread overview]
Message-ID: <4462354.EgehQQfXY4@asus> (raw)
Make sure that blk_cleanup_queue() is called in del_mtd_blktrans_dev().
Signed-off-by: Fubo Chen <fubo.chen@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: linux-mtd@lists.infradead.org
---
drivers/mtd/mtd_blkdevs.c | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c
index 424ca5f..8b72f24 100644
--- a/drivers/mtd/mtd_blkdevs.c
+++ b/drivers/mtd/mtd_blkdevs.c
@@ -196,7 +196,7 @@ static void mtd_blktrans_request(struct request_queue *rq)
dev = rq->queuedata;
- if (!dev)
+ if (unlikely(blk_queue_dead(rq)))
while ((req = blk_fetch_request(rq)) != NULL)
__blk_end_request_all(req, -ENODEV);
else {
@@ -469,8 +469,6 @@ error1:
int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old)
{
- unsigned long flags;
-
if (mutex_trylock(&mtd_table_mutex)) {
mutex_unlock(&mtd_table_mutex);
BUG();
@@ -488,10 +486,7 @@ int del_mtd_blktrans_dev(struct mtd_blktrans_dev *old)
kthread_stop(old->thread);
/* Kill current requests */
- spin_lock_irqsave(&old->queue_lock, flags);
- old->rq->queuedata = NULL;
- blk_start_queue(old->rq);
- spin_unlock_irqrestore(&old->queue_lock, flags);
+ blk_cleanup_queue(old->rq);
/* If the device is currently open, tell trans driver to close it,
then put mtd device, and don't touch it again */
--
1.7.7
next reply other threads:[~2012-02-25 16:57 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-25 16:57 Fubo Chen [this message]
2012-03-09 9:49 ` [PATCH] mtd: Fix memory leak triggered by removal Artem Bityutskiy
2012-03-09 9:48 ` Bityutskiy, Artem
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=4462354.EgehQQfXY4@asus \
--to=fubo.chen@gmail.com \
--cc=dwmw2@infradead.org \
--cc=linux-mtd@lists.infradead.org \
/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