From 28a8cf45f89ea47cc6b9c090730a4e356b5a3f83 Mon Sep 17 00:00:00 2001 From: "Artem B. Bityuckiy" Date: Thu, 7 Jul 2005 16:45:32 +0100 Subject: [PATCH] --- yaml --- r: 4781 b: refs/heads/master c: 336d2ff7115bd4391108a16f476c739cb4a505b0 h: refs/heads/master i: 4779: 94c413e91ef0bb2282817ca1cfdec435170712ce v: v3 --- [refs] | 2 +- trunk/fs/jffs2/readinode.c | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 09d6c98f0c4e..54e4d6a2dc77 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ca70351af02b1f0eb9cd2e7eb7a547f8ad5d893 +refs/heads/master: 336d2ff7115bd4391108a16f476c739cb4a505b0 diff --git a/trunk/fs/jffs2/readinode.c b/trunk/fs/jffs2/readinode.c index 081656c1d49e..8f0be5557ae9 100644 --- a/trunk/fs/jffs2/readinode.c +++ b/trunk/fs/jffs2/readinode.c @@ -7,7 +7,7 @@ * * For licensing information, see the file 'LICENCE' in this directory. * - * $Id: readinode.c,v 1.120 2005/07/05 21:03:07 dwmw2 Exp $ + * $Id: readinode.c,v 1.124 2005/07/07 15:45:29 dedekind Exp $ * */ @@ -151,6 +151,9 @@ int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_in D1(printk(KERN_DEBUG "jffs2_add_full_dnode_to_inode(ino #%u, f %p, fn %p)\n", f->inocache->ino, f, fn)); + if (unlikely(!fn->size)) + return 0; + newfrag = jffs2_alloc_node_frag(); if (unlikely(!newfrag)) return -ENOMEM; @@ -158,11 +161,6 @@ int jffs2_add_full_dnode_to_inode(struct jffs2_sb_info *c, struct jffs2_inode_in D2(printk(KERN_DEBUG "adding node %04x-%04x @0x%08x on flash, newfrag *%p\n", fn->ofs, fn->ofs+fn->size, ref_offset(fn->raw), newfrag)); - if (unlikely(!fn->size)) { - jffs2_free_node_frag(newfrag); - return 0; - } - newfrag->ofs = fn->ofs; newfrag->size = fn->size; newfrag->node = fn;