Patchwork [JFFS2] Fix build failure with !CONFIG_JFFS2_FS_WRITEBUFFER

login
register
mail settings
Submitter Steve Glendinning
Date Oct. 21, 2008, 12:25 p.m.
Message ID <1224591951-30369-1-git-send-email-steve.glendinning@smsc.com>
Download mbox | patch
Permalink /patch/5232/
State New, archived
Headers show

Comments

Steve Glendinning - Oct. 21, 2008, 12:25 p.m.
Build failure introduced by 5bf1723723487ddb0b9c9641b6559da96b27cc93
[JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash

Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
---
 fs/jffs2/nodemgmt.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Alexander Belyakov - Oct. 27, 2008, 9:29 a.m.
On Tue, Oct 21, 2008 at 3:25 PM, Steve Glendinning
<steve.glendinning@smsc.com> wrote:
> Build failure introduced by 5bf1723723487ddb0b9c9641b6559da96b27cc93
> [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash
>
> Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>

Steve,

Thank you for finding this.

Alexander
Steve Glendinning - Nov. 5, 2008, 8:27 a.m.
Alexander,

This build failure still exists in linus's tree (2.6.28-rc3).  Can you 
please push this fix upstream, as it's a build regression for many 
embedded platforms?

Regards,
--
Steve Glendinning
SMSC GmbH
m: +44 777 933 9124
e: steve.glendinning@smsc.com



"Alexander Belyakov" <abelyako@googlemail.com> wrote on 27/10/2008 
09:29:34:

> On Tue, Oct 21, 2008 at 3:25 PM, Steve Glendinning
> <steve.glendinning@smsc.com> wrote:
> > Build failure introduced by 5bf1723723487ddb0b9c9641b6559da96b27cc93
> > [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash
> >
> > Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
> 
> Steve,
> 
> Thank you for finding this.
> 
> Alexander

Patch

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));