summaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
authorArtem B. Bityutskiy <dedekind@infradead.org>2005-08-22 11:07:12 +0200
committerThomas Gleixner <tglx@mtd.linutronix.de>2005-11-06 20:32:36 +0100
commitf0507530cbedf37515e0d803c332cdb81b34e71a (patch)
treeb9a91ac68b4b48a6bb910fcbea51cac4f70233d5 /fs
parent[JFFS2] Calculate CRC check starting point correctly (diff)
downloadlinux-f0507530cbedf37515e0d803c332cdb81b34e71a.tar.xz
linux-f0507530cbedf37515e0d803c332cdb81b34e71a.zip
[JFFS2] Solve BUG caused by frag->node representing a hole in fragtree
Signed-off-by: Artem B. Bityutskiy <dedekind@infradead.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs')
-rw-r--r--fs/jffs2/nodelist.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/jffs2/nodelist.c b/fs/jffs2/nodelist.c
index fd21f109fbd2..9abb5f4cfd75 100644
--- a/fs/jffs2/nodelist.c
+++ b/fs/jffs2/nodelist.c
@@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
- * $Id: nodelist.c,v 1.111 2005/08/17 14:57:39 dedekind Exp $
+ * $Id: nodelist.c,v 1.112 2005/08/22 09:07:09 dedekind Exp $
*
*/
@@ -80,7 +80,7 @@ void jffs2_truncate_fragtree(struct jffs2_sb_info *c, struct rb_root *list, uint
* REF_PRISTINE irrespective of its size.
*/
frag = frag_last(list);
- if ((frag->ofs & (PAGE_CACHE_SIZE - 1)) == 0) {
+ if (frag->node && (frag->ofs & (PAGE_CACHE_SIZE - 1)) == 0) {
JFFS2_DBG_FRAGTREE2("marking the last fragment 0x%08x-0x%08x REF_PRISTINE.\n",
frag->ofs, frag->ofs + frag->size);
frag->node->raw->flash_offset = ref_offset(frag->node->raw) | REF_PRISTINE;