mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-05 10:04:12 +08:00
UBI: fix warnings when debugging is enabled
The 'ubi_io_read_vid_hdr()' and 'ubi_io_read_ec_hdr()' function have the 'verbose' argument which controls whether they should print a warning if the VID/EC header was not found or was corrupted. Some callers require the headers to be OK, and pass 1. Some allow a corrupted/not present header, and pass 0. if (UBI_IO_DEBUG) verbose = 1; And UBI_IO_DEBUG is 1 if CONFIG_MTD_UBI_DEBUG_MSG_BLD is true. So in this case the warning is printed all the time. This confuses people. Thus, do not print the messages as warnings if UBI_IO_DEBUG is true, but print them as debugging messages instead. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
This commit is contained in:
parent
f6f7b52e2f
commit
ed45819f31
@ -637,8 +637,6 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
|
|
||||||
dbg_io("read EC header from PEB %d", pnum);
|
dbg_io("read EC header from PEB %d", pnum);
|
||||||
ubi_assert(pnum >= 0 && pnum < ubi->peb_count);
|
ubi_assert(pnum >= 0 && pnum < ubi->peb_count);
|
||||||
if (UBI_IO_DEBUG)
|
|
||||||
verbose = 1;
|
|
||||||
|
|
||||||
err = ubi_io_read(ubi, ec_hdr, pnum, 0, UBI_EC_HDR_SIZE);
|
err = ubi_io_read(ubi, ec_hdr, pnum, 0, UBI_EC_HDR_SIZE);
|
||||||
if (err) {
|
if (err) {
|
||||||
@ -685,6 +683,9 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
if (verbose)
|
if (verbose)
|
||||||
ubi_warn("no EC header found at PEB %d, "
|
ubi_warn("no EC header found at PEB %d, "
|
||||||
"only 0xFF bytes", pnum);
|
"only 0xFF bytes", pnum);
|
||||||
|
else if (UBI_IO_DEBUG)
|
||||||
|
dbg_msg("no EC header found at PEB %d, "
|
||||||
|
"only 0xFF bytes", pnum);
|
||||||
return UBI_IO_PEB_EMPTY;
|
return UBI_IO_PEB_EMPTY;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -696,7 +697,9 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
ubi_warn("bad magic number at PEB %d: %08x instead of "
|
ubi_warn("bad magic number at PEB %d: %08x instead of "
|
||||||
"%08x", pnum, magic, UBI_EC_HDR_MAGIC);
|
"%08x", pnum, magic, UBI_EC_HDR_MAGIC);
|
||||||
ubi_dbg_dump_ec_hdr(ec_hdr);
|
ubi_dbg_dump_ec_hdr(ec_hdr);
|
||||||
}
|
} else if (UBI_IO_DEBUG)
|
||||||
|
dbg_msg("bad magic number at PEB %d: %08x instead of "
|
||||||
|
"%08x", pnum, magic, UBI_EC_HDR_MAGIC);
|
||||||
return UBI_IO_BAD_EC_HDR;
|
return UBI_IO_BAD_EC_HDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -708,7 +711,9 @@ int ubi_io_read_ec_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
ubi_warn("bad EC header CRC at PEB %d, calculated "
|
ubi_warn("bad EC header CRC at PEB %d, calculated "
|
||||||
"%#08x, read %#08x", pnum, crc, hdr_crc);
|
"%#08x, read %#08x", pnum, crc, hdr_crc);
|
||||||
ubi_dbg_dump_ec_hdr(ec_hdr);
|
ubi_dbg_dump_ec_hdr(ec_hdr);
|
||||||
}
|
} else if (UBI_IO_DEBUG)
|
||||||
|
dbg_msg("bad EC header CRC at PEB %d, calculated "
|
||||||
|
"%#08x, read %#08x", pnum, crc, hdr_crc);
|
||||||
return UBI_IO_BAD_EC_HDR;
|
return UBI_IO_BAD_EC_HDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -912,8 +917,6 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
|
|
||||||
dbg_io("read VID header from PEB %d", pnum);
|
dbg_io("read VID header from PEB %d", pnum);
|
||||||
ubi_assert(pnum >= 0 && pnum < ubi->peb_count);
|
ubi_assert(pnum >= 0 && pnum < ubi->peb_count);
|
||||||
if (UBI_IO_DEBUG)
|
|
||||||
verbose = 1;
|
|
||||||
|
|
||||||
p = (char *)vid_hdr - ubi->vid_hdr_shift;
|
p = (char *)vid_hdr - ubi->vid_hdr_shift;
|
||||||
err = ubi_io_read(ubi, p, pnum, ubi->vid_hdr_aloffset,
|
err = ubi_io_read(ubi, p, pnum, ubi->vid_hdr_aloffset,
|
||||||
@ -960,6 +963,9 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
if (verbose)
|
if (verbose)
|
||||||
ubi_warn("no VID header found at PEB %d, "
|
ubi_warn("no VID header found at PEB %d, "
|
||||||
"only 0xFF bytes", pnum);
|
"only 0xFF bytes", pnum);
|
||||||
|
else if (UBI_IO_DEBUG)
|
||||||
|
dbg_msg("no VID header found at PEB %d, "
|
||||||
|
"only 0xFF bytes", pnum);
|
||||||
return UBI_IO_PEB_FREE;
|
return UBI_IO_PEB_FREE;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -971,7 +977,9 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
ubi_warn("bad magic number at PEB %d: %08x instead of "
|
ubi_warn("bad magic number at PEB %d: %08x instead of "
|
||||||
"%08x", pnum, magic, UBI_VID_HDR_MAGIC);
|
"%08x", pnum, magic, UBI_VID_HDR_MAGIC);
|
||||||
ubi_dbg_dump_vid_hdr(vid_hdr);
|
ubi_dbg_dump_vid_hdr(vid_hdr);
|
||||||
}
|
} else if (UBI_IO_DEBUG)
|
||||||
|
dbg_msg("bad magic number at PEB %d: %08x instead of "
|
||||||
|
"%08x", pnum, magic, UBI_VID_HDR_MAGIC);
|
||||||
return UBI_IO_BAD_VID_HDR;
|
return UBI_IO_BAD_VID_HDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -983,7 +991,9 @@ int ubi_io_read_vid_hdr(struct ubi_device *ubi, int pnum,
|
|||||||
ubi_warn("bad CRC at PEB %d, calculated %#08x, "
|
ubi_warn("bad CRC at PEB %d, calculated %#08x, "
|
||||||
"read %#08x", pnum, crc, hdr_crc);
|
"read %#08x", pnum, crc, hdr_crc);
|
||||||
ubi_dbg_dump_vid_hdr(vid_hdr);
|
ubi_dbg_dump_vid_hdr(vid_hdr);
|
||||||
}
|
} else if (UBI_IO_DEBUG)
|
||||||
|
dbg_msg("bad CRC at PEB %d, calculated %#08x, "
|
||||||
|
"read %#08x", pnum, crc, hdr_crc);
|
||||||
return UBI_IO_BAD_VID_HDR;
|
return UBI_IO_BAD_VID_HDR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user