[Armadeus-commitlog] SF.net SVN: armadeus:[1078] trunk/buildroot/target/device/armadeus/linux/ ker
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1078] trunk/buildroot/target/device/armadeus/linux/ kernel-patches/2.6.27.13/300-apf27-armadeus-jffs2_debug.patch
|
From: <th...@us...> - 2009-02-23 08:48:30
|
Revision: 1078
http://armadeus.svn.sourceforge.net/armadeus/?rev=1078&view=rev
Author: thom25
Date: 2009-02-23 08:48:24 +0000 (Mon, 23 Feb 2009)
Log Message:
-----------
[KERNEL] change info message to debug one
Modified Paths:
--------------
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/300-apf27-armadeus-jffs2_debug.patch
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/300-apf27-armadeus-jffs2_debug.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/300-apf27-armadeus-jffs2_debug.patch 2009-02-22 15:06:38 UTC (rev 1077)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.27.13/300-apf27-armadeus-jffs2_debug.patch 2009-02-23 08:48:24 UTC (rev 1078)
@@ -1,39 +1,50 @@
--- linux-2.6.27.2.ref/fs/jffs2/scan.c 2008-12-19 13:47:54.000000000 +0100
+++ linux-2.6.27.2/fs/jffs2/scan.c 2008-12-19 13:51:44.000000000 +0100
-@@ -647,8 +647,8 @@ scan_more:
+@@ -647,7 +647,7 @@ scan_more:
inbuf_ofs = ofs - buf_ofs;
while (inbuf_ofs < scan_end) {
if (unlikely(*(uint32_t *)(&buf[inbuf_ofs]) != 0xffffffff)) {
- printk(KERN_WARNING "Empty flash at 0x%08x ends at 0x%08x\n",
-- empty_start, ofs);
-+ D1(printk(KERN_WARNING "Empty flash at 0x%08x ends at 0x%08x\n",
-+ empty_start, ofs));
++ printk(KERN_DEBUG "Empty flash at 0x%08x ends at 0x%08x\n",
+ empty_start, ofs);
if ((err = jffs2_scan_dirty_space(c, jeb, ofs-empty_start)))
return err;
- goto scan_more;
-@@ -965,9 +965,9 @@ static int jffs2_scan_inode_node(struct
+@@ -715,7 +715,7 @@ scan_more:
+ }
+ if (je16_to_cpu(node->magic) != JFFS2_MAGIC_BITMASK) {
+ /* OK. We're out of possibilities. Whinge and move on */
+- noisy_printk(&noise, "jffs2_scan_eraseblock(): Magic bitmask 0x%04x not found at 0x%08x: 0x%04x instead\n",
++ printk(KERN_DEBUG "jffs2_scan_eraseblock(): Magic bitmask 0x%04x not found at 0x%08x: 0x%04x instead\n",
+ JFFS2_MAGIC_BITMASK, ofs,
+ je16_to_cpu(node->magic));
+ if ((err = jffs2_scan_dirty_space(c, jeb, 4)))
+@@ -730,7 +730,7 @@ scan_more:
+ hdr_crc = crc32(0, &crcnode, sizeof(crcnode)-4);
+
+ if (hdr_crc != je32_to_cpu(node->hdr_crc)) {
+- noisy_printk(&noise, "jffs2_scan_eraseblock(): Node at 0x%08x {0x%04x, 0x%04x, 0x%08x) has invalid CRC 0x%08x (calculated 0x%08x)\n",
++ printk(KERN_DEBUG "jffs2_scan_eraseblock(): Node at 0x%08x {0x%04x, 0x%04x, 0x%08x) has invalid CRC 0x%08x (calculated 0x%08x)\n",
+ ofs, je16_to_cpu(node->magic),
+ je16_to_cpu(node->nodetype),
+ je32_to_cpu(node->totlen),
+@@ -965,7 +965,7 @@ static int jffs2_scan_inode_node(struct
/* Check the node CRC in any case. */
crc = crc32(0, ri, sizeof(*ri)-8);
if (crc != je32_to_cpu(ri->node_crc)) {
- printk(KERN_NOTICE "jffs2_scan_inode_node(): CRC failed on "
-+ D1(printk(KERN_NOTICE "jffs2_scan_inode_node(): CRC failed on "
++ printk(KERN_DEBUG "jffs2_scan_inode_node(): CRC failed on "
"node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",
-- ofs, je32_to_cpu(ri->node_crc), crc);
-+ ofs, je32_to_cpu(ri->node_crc), crc));
+ ofs, je32_to_cpu(ri->node_crc), crc);
/*
- * We believe totlen because the CRC on the node
- * _header_ was OK, just the node itself failed.
-@@ -1041,8 +1041,8 @@ static int jffs2_scan_dirent_node(struct
+@@ -1041,7 +1041,7 @@ static int jffs2_scan_dirent_node(struct
crc = crc32(0, fd->name, rd->nsize);
if (crc != je32_to_cpu(rd->name_crc)) {
- printk(KERN_NOTICE "jffs2_scan_dirent_node(): Name CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",
-- ofs, je32_to_cpu(rd->name_crc), crc);
-+ D1(printk(KERN_NOTICE "jffs2_scan_dirent_node(): Name CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",
-+ ofs, je32_to_cpu(rd->name_crc), crc));
++ printk(KERN_DEBUG "jffs2_scan_dirent_node(): Name CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",
+ ofs, je32_to_cpu(rd->name_crc), crc);
D1(printk(KERN_NOTICE "Name for which CRC failed is (now) '%s', ino #%d\n", fd->name, je32_to_cpu(rd->ino)));
jffs2_free_full_dirent(fd);
- /* FIXME: Why do we believe totlen? */
--- linux-2.6.27.2.ref/fs/jffs2/readinode.c 2008-12-19 14:03:21.000000000 +0100
+++ linux-2.6.27.2/fs/jffs2/readinode.c 2008-12-19 14:03:44.000000000 +0100
@@ -105,7 +105,7 @@ static int check_node_data(struct jffs2_
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
