From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Cc: Richard Weinberger <richard@nod.at>
Subject: [PATCH 2/9] UBI: Fix invalidate_fastmap()
Date: Tue, 7 Jan 2014 11:05:28 +0100 [thread overview]
Message-ID: <1389089135-29986-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1389089135-29986-1-git-send-email-s.hauer@pengutronix.de>
From: Richard Weinberger <richard@nod.at>
Onging tests uncovered that invalidate_fastmap() is broken.
It must not call ubi_wl_put_fm_peb() because all PEBs used
by the old fastmap have already been put back.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
---
drivers/mtd/ubi/fastmap.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/drivers/mtd/ubi/fastmap.c b/drivers/mtd/ubi/fastmap.c
index 939e534..4d120ae 100644
--- a/drivers/mtd/ubi/fastmap.c
+++ b/drivers/mtd/ubi/fastmap.c
@@ -1338,7 +1338,7 @@ out:
static int invalidate_fastmap(struct ubi_device *ubi,
struct ubi_fastmap_layout *fm)
{
- int ret, i;
+ int ret;
struct ubi_vid_hdr *vh;
ret = erase_block(ubi, fm->e[0]->pnum);
@@ -1355,9 +1355,6 @@ static int invalidate_fastmap(struct ubi_device *ubi,
vh->sqnum = cpu_to_be64(ubi_next_sqnum(ubi));
ret = ubi_io_write_vid_hdr(ubi, fm->e[0]->pnum, vh);
- for (i = 0; i < fm->used_blocks; i++)
- ubi_wl_put_fm_peb(ubi, fm->e[i], i, fm->to_be_tortured[i]);
-
return ret;
}
--
1.8.5.2
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-01-07 10:11 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-07 10:05 UBI patches Sascha Hauer
2014-01-07 10:05 ` [PATCH 1/9] UBI: Fix PEB leak in wear_leveling_worker() Sascha Hauer
2014-01-07 10:05 ` Sascha Hauer [this message]
2014-01-07 10:05 ` [PATCH 3/9] UBI: fix refill_wl_user_pool() Sascha Hauer
2014-01-07 10:05 ` [PATCH 4/9] UBI: Fix error path in scan_pool() Sascha Hauer
2014-01-07 10:05 ` [PATCH 5/9] UBI: Call scan_all() with correct offset in error case Sascha Hauer
2014-01-07 10:05 ` [PATCH 6/9] UBI: fastmap: fix backward compatibility with image_seq Sascha Hauer
2014-01-07 10:05 ` [PATCH 7/9] UBI: simplify image sequence test Sascha Hauer
2014-01-07 10:05 ` [PATCH 8/9] UBI: Fix memory leak in ubi_attach_fastmap() error path Sascha Hauer
2014-01-07 10:05 ` [PATCH 9/9] UBI: Add some asserts to ubi_attach_fastmap() Sascha Hauer
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=1389089135-29986-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=richard@nod.at \
/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