From patchwork Fri Dec 31 01:45:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Chou X-Patchwork-Id: 77044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from canuck.infradead.org (canuck.infradead.org [134.117.69.58]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id EB060B70D5 for ; Fri, 31 Dec 2010 12:52:32 +1100 (EST) Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1PYU40-0003Y2-57; Fri, 31 Dec 2010 01:45:52 +0000 Received: from www.wytron.com.tw ([211.75.82.101]) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1PYU36-0003XM-Cf for linux-mtd@lists.infradead.org; Fri, 31 Dec 2010 01:45:00 +0000 Received: from [192.168.1.15] (helo=darkstar.wytron.com.tw) by www.wytron.com.tw with esmtp (Exim 4.69) (envelope-from ) id 1PYU2P-0000QM-H4; Fri, 31 Dec 2010 09:44:13 +0800 From: Thomas Chou To: Artem Bityutskiy Subject: [PATCH] mkfs.jffs2: fix repeated dev nodes Date: Fri, 31 Dec 2010 09:45:19 +0800 Message-Id: <1293759919-3297-1-git-send-email-thomas@wytron.com.tw> X-Mailer: git-send-email 1.7.3.4 In-Reply-To: <4D1C3565.1030800@wytron.com.tw> References: <4D1C3565.1030800@wytron.com.tw> X-SA-Exim-Connect-IP: 192.168.1.15 X-SA-Exim-Mail-From: thomas@wytron.com.tw X-SA-Exim-Scanned: No (on www.wytron.com.tw); SAEximRunCond expanded to false X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20101230_204456_724180_E5CF4FDB X-CRM114-Status: UNSURE ( 9.81 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: linux-mtd@lists.infradead.org, Mike Frysinger , Thomas Chou X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 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 Fix the repeated nodes with the same primary name in device_table.txt. They were not generated correctly. /dev/tty c 666 0 0 5 0 0 0 - /dev/tty c 666 0 0 4 0 0 1 6 # IDE Devices /dev/hda b 640 0 0 3 0 0 0 - /dev/hda b 640 0 0 3 1 1 1 15 /dev/hdb b 640 0 0 3 64 0 0 - /dev/hdb b 640 0 0 3 65 1 1 15 Only created, /dev/tty /dev/hda /dev/hdb Signed-off-by: Thomas Chou --- mkfs.jffs2.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/mkfs.jffs2.c b/mkfs.jffs2.c index 256eec4..717e1cc 100644 --- a/mkfs.jffs2.c +++ b/mkfs.jffs2.c @@ -457,7 +457,7 @@ static int interpret_table_entry(struct filesystem_entry *root, char *line) errmsg_die("Unsupported file type '%c'", type); } entry = find_filesystem_entry(root, name, mode); - if (entry) { + if (entry && !(count > 0 && (type == 'c' || type == 'b'))) { /* Ok, we just need to fixup the existing entry * and we will be all done... */ entry->sb.st_uid = uid;