aboutsummaryrefslogtreecommitdiff
path: root/fs/jffs2/wbuf.c
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-05-25 01:50:35 +0100
committerDavid Woodhouse <dwmw2@infradead.org>2006-05-25 01:50:35 +0100
commit046b8b9808127d63326a33bc6298c90eaee90eeb (patch)
tree93caaabd7ae10969acb4758634b9b1c9448ef951 /fs/jffs2/wbuf.c
parentf61579c33736476e41e296a16c0d4ead4b953187 (diff)
downloadlinux-linaro-046b8b9808127d63326a33bc6298c90eaee90eeb.tar.gz
[JFFS2] Add 'jeb' argument to jffs2_prealloc_raw_node_refs()
Preallocation of refs is shortly going to be a per-eraseblock thing, rather than per-filesystem. Add the required argument to the function. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/wbuf.c')
-rw-r--r--fs/jffs2/wbuf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c
index 1871140e1e7..e16e45ea047 100644
--- a/fs/jffs2/wbuf.c
+++ b/fs/jffs2/wbuf.c
@@ -179,13 +179,13 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c)
unsigned char *buf;
uint32_t start, end, ofs, len;
- if (jffs2_prealloc_raw_node_refs(c, c->reserved_refs + 1))
+ jeb = &c->blocks[c->wbuf_ofs / c->sector_size];
+
+ if (jffs2_prealloc_raw_node_refs(c, jeb, c->reserved_refs + 1))
return;
spin_lock(&c->erase_completion_lock);
- jeb = &c->blocks[c->wbuf_ofs / c->sector_size];
-
jffs2_block_refile(c, jeb, REFILE_NOTEMPTY);
/* Find the first node to be recovered, by skipping over every
@@ -417,7 +417,7 @@ static int __jffs2_flush_wbuf(struct jffs2_sb_info *c, int pad)
if (!c->wbuf_len) /* already checked c->wbuf above */
return 0;
- if (jffs2_prealloc_raw_node_refs(c, c->reserved_refs + 1))
+ if (jffs2_prealloc_raw_node_refs(c, c->nextblock, c->reserved_refs + 1))
return -ENOMEM;
/* claim remaining space on the page