From ff3c3656d5185c0bcac14610a59f8aee8c177dec Mon Sep 17 00:00:00 2001
From: Steve Glendinning <steve.glendinning@smsc.com>
Date: Tue, 21 Oct 2008 13:25:51 +0100
Subject: [PATCH] --- yaml --- r: 118471 b: refs/heads/master c:
 f04de505e3fa322728d1a851e08bf7060b117743 h: refs/heads/master i:   118469:
 b0e899b4855b64d16c4da0d8a1ced7bae7ab920e   118467:
 61f5825704f4601e2f09e5107f211c380a6bae49   118463:
 905d1518564437ba765e153508653e7bc27babd6 v: v3

---
 [refs]                    | 2 +-
 trunk/fs/jffs2/nodemgmt.c | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 98d8fd9af051..a927a9f6c5db 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0f0254fa8ddce39ce4e98113e7050e1cd88ff884
+refs/heads/master: f04de505e3fa322728d1a851e08bf7060b117743
diff --git a/trunk/fs/jffs2/nodemgmt.c b/trunk/fs/jffs2/nodemgmt.c
index 0875b60b4bf7..21a052915aa9 100644
--- a/trunk/fs/jffs2/nodemgmt.c
+++ b/trunk/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));