Return-path: Envelope-to: dwmw2@baythorne.infradead.org Delivery-date: Thu, 09 Feb 2006 16:18:14 +0000 Received: from canuck.infradead.org ([2001:8b0:10b:4::1]) by baythorne.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1F7EUn-0008O9-Dy for dwmw2@baythorne.infradead.org; Thu, 09 Feb 2006 16:18:13 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.54 #1 (Red Hat Linux)) id 1F7EUj-0000bD-0L; Thu, 09 Feb 2006 11:18:09 -0500 Received: from phoenix.infradead.org ([81.187.2.162]) by canuck.infradead.org with esmtps (Exim 4.54 #1 (Red Hat Linux)) id 1F7EUf-0000b0-4k for linux-mtd-cvs@lists.infradead.org; Thu, 09 Feb 2006 11:18:05 -0500 Received: from dwmw2 by phoenix.infradead.org with local (Exim 4.43 #1 (Red Hat Linux)) id 1F7EPl-0007Vk-PT for linux-mtd-cvs@lists.infradead.org; Thu, 09 Feb 2006 16:13:01 +0000 Content-Type: TEXT/PLAIN; charset=US-ASCII To: linux-mtd-cvs@lists.infradead.org X-CVS-Module: mtd X-CVS-Directory: mtd/fs/jffs2 Precedence: first-class Message-Id: From: David Woodhouse Date: Thu, 09 Feb 2006 16:13:01 +0000 X-SRS-Rewrite: SMTP reverse-path rewritten from by phoenix.infradead.org See http://www.infradead.org/rpr.html Subject: mtd/fs/jffs2 scan.c,1.134,1.135 X-BeenThere: linux-mtd-cvs@lists.infradead.org X-Mailman-Version: 2.1.5 List-Id: Linux MTD CVS commit list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-cvs-bounces@lists.infradead.org Errors-To: linux-mtd-cvs-bounces+dwmw2=infradead.org+dwmw2=infradead.org@lists.infradead.org X-Evolution-Source: imap://dwmw2@pentafluge.infradead.org/ Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Update of /home/cvs/mtd/fs/jffs2 In directory phoenix.infradead.org:/tmp/cvs-serv28853 Modified Files: scan.c Log Message: Avoid divide-by-zero Index: scan.c =================================================================== RCS file: /home/cvs/mtd/fs/jffs2/scan.c,v retrieving revision 1.134 retrieving revision 1.135 diff -u -r1.134 -r1.135 --- scan.c 13 Jan 2006 10:25:29 -0000 1.134 +++ scan.c 9 Feb 2006 16:12:59 -0000 1.135 @@ -239,7 +239,7 @@ c->nextblock->dirty_size = 0; } #ifdef CONFIG_JFFS2_FS_WRITEBUFFER - if (!jffs2_can_mark_obsolete(c) && c->nextblock && (c->nextblock->free_size % c->wbuf_pagesize)) { + if (!jffs2_can_mark_obsolete(c) && c->wbuf_pagesize && c->nextblock && (c->nextblock->free_size % c->wbuf_pagesize)) { /* If we're going to start writing into a block which already contains data, and the end of the data isn't page-aligned, skip a little and align it. */ __________________________________________________________ Linux-MTD CVS commit list http://lists.infradead.org/mailman/listinfo/linux-mtd-cvs/