[PATCH] [JFFS2] Prevent list corruption when handling write errors

[PATCH] [JFFS2] Prevent list corruption when handling write errors

[Adrian Hunter]

If a write error occurs, the affected block is placed on the
bad_used_list.  In the case that the write error occured
when writing summary data the block was also being placed on
the dirty_list, which caused list corruption and ultimately
a soft lockup in jffs2_mark_node_obsolete. This fixes that.

Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com>
---
 fs/jffs2/nodemgmt.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index d883769..c8b50de 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -172,6 +172,11 @@ int jffs2_reserve_space_gc(struct jffs2_
 static void jffs2_close_nextblock(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
 {
 
+	if (c->nextblock == NULL) {
+		D1(printk(KERN_DEBUG "jffs2_close_nextblock: Erase block at 0x%08x has already been placed in a list\n",
+		  jeb->offset));
+		return;
+	}
 	/* Check, if we have a dirty block now, or if it was dirty already */
 	if (ISDIRTY (jeb->wasted_size + jeb->dirty_size)) {
 		c->dirty_size += jeb->wasted_size;
-- 
1.4.3

Re: [PATCH] [JFFS2] Prevent list corruption when handling write errors

[Joakim Tjernlund]

On Thu, 2007-03-29 at 11:00 +0300, Adrian Hunter wrote:
> If a write error occurs, the affected block is placed on the
> bad_used_list.  In the case that the write error occured
> when writing summary data the block was also being placed on
> the dirty_list, which caused list corruption and ultimately
> a soft lockup in jffs2_mark_node_obsolete. This fixes that.

I thougth that node obsoleting was disabled when summary is active?

 Jocke

Re: [PATCH] [JFFS2] Prevent list corruption when handling write errors

[Artem Bityutskiy]

On Thu, 2007-03-29 at 11:52 +0200, Joakim Tjernlund wrote:
> On Thu, 2007-03-29 at 11:00 +0300, Adrian Hunter wrote:
> > If a write error occurs, the affected block is placed on the
> > bad_used_list.  In the case that the write error occured
> > when writing summary data the block was also being placed on
> > the dirty_list, which caused list corruption and ultimately
> > a soft lockup in jffs2_mark_node_obsolete. This fixes that.
> 
> I thougth that node obsoleting was disabled when summary is active?

Of course not. On-flash obsoleting is disabled, but not in-RAM.

-- 
Best regards,
Artem Bityutskiy (Битюцкий Артём)