diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-05-23 00:38:06 +0100 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-05-23 00:38:06 +0100 |
| commit | 9fe4854cd1f60273f9a3ece053f4789605f58a5e (patch) | |
| tree | 277ac17807a1596f78464641500ed35f3d47a32a /fs/jffs2/wbuf.c | |
| parent | 5fa433942ba4e399f7e28764c9db4ade89e91d40 (diff) | |
| download | kernel_samsung_tuna-9fe4854cd1f60273f9a3ece053f4789605f58a5e.zip kernel_samsung_tuna-9fe4854cd1f60273f9a3ece053f4789605f58a5e.tar.gz kernel_samsung_tuna-9fe4854cd1f60273f9a3ece053f4789605f58a5e.tar.bz2 | |
[JFFS2] Remove flash offset argument from various functions.
We don't need the upper layers to deal with the physical offset. It's
_always_ c->nextblock->offset + c->sector_size - c->nextblock->free_size
so we might as well just let the actual write functions deal with that.
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
Diffstat (limited to 'fs/jffs2/wbuf.c')
| -rw-r--r-- | fs/jffs2/wbuf.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/jffs2/wbuf.c b/fs/jffs2/wbuf.c index 087c2e4..c7e3040 100644 --- a/fs/jffs2/wbuf.c +++ b/fs/jffs2/wbuf.c @@ -265,12 +265,14 @@ static void jffs2_wbuf_recover(struct jffs2_sb_info *c) /* ... and get an allocation of space from a shiny new block instead */ - ret = jffs2_reserve_space_gc(c, end-start, &ofs, &len, JFFS2_SUMMARY_NOSUM_SIZE); + ret = jffs2_reserve_space_gc(c, end-start, &len, JFFS2_SUMMARY_NOSUM_SIZE); if (ret) { printk(KERN_WARNING "Failed to allocate space for wbuf recovery. Data loss ensues.\n"); kfree(buf); return; } + ofs = write_ofs(c); + if (end-start >= c->wbuf_pagesize) { /* Need to do another write immediately, but it's possible that this is just because the wbuf itself is completely |