[JFFS2] Fix build failure with !CONFIG_JFFS2_FS_WRITEBUFFER

Linux-MTD Mailing List linux-mtd at lists.infradead.org
Tue Oct 21 08:59:01 EDT 2008


Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=f04de505e3fa322728d1a851e08bf7060b117743
Commit:     f04de505e3fa322728d1a851e08bf7060b117743
Parent:     0f0254fa8ddce39ce4e98113e7050e1cd88ff884
Author:     Steve Glendinning <steve.glendinning at smsc.com>
AuthorDate: Tue Oct 21 13:25:51 2008 +0100
Committer:  David Woodhouse <David.Woodhouse at intel.com>
CommitDate: Tue Oct 21 13:37:43 2008 +0100

    [JFFS2] Fix build failure with !CONFIG_JFFS2_FS_WRITEBUFFER
    
    Build failure introduced by 5bf1723723487ddb0b9c9641b6559da96b27cc93
    [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash
    
    Signed-off-by: Steve Glendinning <steve.glendinning at smsc.com>
    Signed-off-by: David Woodhouse <David.Woodhouse at intel.com>
---
 fs/jffs2/nodemgmt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/fs/jffs2/nodemgmt.c b/fs/jffs2/nodemgmt.c
index 0875b60..21a0529 100644
--- a/fs/jffs2/nodemgmt.c
+++ b/fs/jffs2/nodemgmt.c
@@ -261,9 +261,11 @@ static int jffs2_find_nextblock(struct jffs2_sb_info *c)
 
 	jffs2_sum_reset_collected(c->summary); /* reset collected summary */
 
+#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
 	/* adjust write buffer offset, else we get a non contiguous write bug */
 	if (!(c->wbuf_ofs % c->sector_size) && !c->wbuf_len)
 		c->wbuf_ofs = 0xffffffff;
+#endif
 
 	D1(printk(KERN_DEBUG "jffs2_find_nextblock(): new nextblock = 0x%08x\n", c->nextblock->offset));
 



More information about the linux-mtd-cvs mailing list