From patchwork Tue Oct 21 12:25:51 2008 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Glendinning X-Patchwork-Id: 5232 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 45527DDDE1 for ; Tue, 21 Oct 2008 23:48:59 +1100 (EST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1KsGZz-0002gN-N7; Tue, 21 Oct 2008 12:43:19 +0000 Received: from [86.54.240.115] (helo=drevil.shawell.net) by bombadil.infradead.org with esmtps (Exim 4.68 #1 (Red Hat Linux)) id 1KsGZx-0002ZT-Tg for linux-mtd@lists.infradead.org; Tue, 21 Oct 2008 12:43:18 +0000 Received: from localhost.localdomain (unknown [10.0.20.15]) by drevil.shawell.net (Postfix) with ESMTP id 61C3FC0ED; Tue, 21 Oct 2008 13:25:50 +0100 (BST) From: Steve Glendinning To: Alexander Belyakov Subject: [PATCH] [JFFS2] Fix build failure with !CONFIG_JFFS2_FS_WRITEBUFFER Date: Tue, 21 Oct 2008 13:25:51 +0100 Message-Id: <1224591951-30369-1-git-send-email-steve.glendinning@smsc.com> X-Mailer: git-send-email 1.5.5.1 X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.1 RDNS_NONE Delivered to trusted network by a host with no rDNS Cc: Steve Glendinning , linux-mtd@lists.infradead.org, David Woodhouse , Ian Saturley X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Build failure introduced by 5bf1723723487ddb0b9c9641b6559da96b27cc93 [JFFS2] Write buffer offset adjustment for NOR-ECC (Sibley) flash Signed-off-by: Steve Glendinning --- 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));