diff options
author | Estelle Hammache <estelle.hammache@st.com> | 2005-01-28 13:53:05 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@mtd.linutronix.de> | 2005-05-23 06:16:06 -0400 |
commit | 9b88f47390efb72540b050628ebc04202d91c6ec (patch) | |
tree | 13d56b9a76a76b7dca5509cad63827570b3496b1 /fs/jffs2/nodemgmt.c | |
parent | 6170b43401a3230756ff76287ee07db0d75eddde (diff) |
[JFFS2] Code cleanup
Code beautification and block filing correction for optimization.
Signed-off-by: Estelle Hammache <estelle.hammache@st.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'fs/jffs2/nodemgmt.c')
-rw-r--r-- | fs/jffs2/nodemgmt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c index b2a53879d3b9..5e1e8caf54e8 100644 --- a/fs/jffs2/nodemgmt.c +++ b/fs/jffs2/nodemgmt.c | |||
@@ -7,7 +7,7 @@ | |||
7 | * | 7 | * |
8 | * For licensing information, see the file 'LICENCE' in this directory. | 8 | * For licensing information, see the file 'LICENCE' in this directory. |
9 | * | 9 | * |
10 | * $Id: nodemgmt.c,v 1.116 2005/01/24 21:30:22 hammache Exp $ | 10 | * $Id: nodemgmt.c,v 1.117 2005/01/25 20:11:11 hammache Exp $ |
11 | * | 11 | * |
12 | */ | 12 | */ |
13 | 13 | ||
@@ -310,8 +310,8 @@ int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_r | |||
310 | #if 1 | 310 | #if 1 |
311 | /* we could get some obsolete nodes after nextblock was refiled | 311 | /* we could get some obsolete nodes after nextblock was refiled |
312 | in wbuf.c */ | 312 | in wbuf.c */ |
313 | if ( (c->nextblock || !ref_obsolete(new)) | 313 | if ((c->nextblock || !ref_obsolete(new)) |
314 | &&(jeb != c->nextblock || (ref_offset(new)) != jeb->offset + (c->sector_size - jeb->free_size))) { | 314 | &&(jeb != c->nextblock || ref_offset(new) != jeb->offset + (c->sector_size - jeb->free_size))) { |
315 | printk(KERN_WARNING "argh. node added in wrong place\n"); | 315 | printk(KERN_WARNING "argh. node added in wrong place\n"); |
316 | jffs2_free_raw_node_ref(new); | 316 | jffs2_free_raw_node_ref(new); |
317 | return -EINVAL; | 317 | return -EINVAL; |
@@ -335,7 +335,7 @@ int jffs2_add_physical_node_ref(struct jffs2_sb_info *c, struct jffs2_raw_node_r | |||
335 | c->used_size += len; | 335 | c->used_size += len; |
336 | } | 336 | } |
337 | 337 | ||
338 | if (!jeb->free_size && !jeb->dirty_size && !jeb->wasted_size) { | 338 | if (!jeb->free_size && !jeb->dirty_size && !ISDIRTY(jeb->wasted_size)) { |
339 | /* If it lives on the dirty_list, jffs2_reserve_space will put it there */ | 339 | /* If it lives on the dirty_list, jffs2_reserve_space will put it there */ |
340 | D1(printk(KERN_DEBUG "Adding full erase block at 0x%08x to clean_list (free 0x%08x, dirty 0x%08x, used 0x%08x\n", | 340 | D1(printk(KERN_DEBUG "Adding full erase block at 0x%08x to clean_list (free 0x%08x, dirty 0x%08x, used 0x%08x\n", |
341 | jeb->offset, jeb->free_size, jeb->dirty_size, jeb->used_size)); | 341 | jeb->offset, jeb->free_size, jeb->dirty_size, jeb->used_size)); |