Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-05 15:58:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fs/: Change some *err() message to *info() messages if what was a *dbg() message does not indicate and error condition.

Browse Source
This commit is contained in:
Gregory Nutt
2016-06-11 17:14:02 -06:00
parent be80a0b99c
commit ad2f7b0119
21 changed files with 173 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fs/fat/fs_configfat.c
+18 -18
View File
@@ -473,7 +473,7 @@ mkfatfs_tryfat12(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
if (config->fc_nclusters + 2 > maxnclusters)
{
ferr("Too many clusters for FAT12: %d > %d\n",
ferr("ERROR: Too many clusters for FAT12: %d > %d\n",
config->fc_nclusters, maxnclusters - 2);
return -ENFILE;
@@ -550,7 +550,7 @@ mkfatfs_tryfat16(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
if ((config->fc_nclusters + 2 > maxnclusters) ||
(config->fc_nclusters < FAT_MINCLUST16))
{
ferr("Too few or too many clusters for FAT16: %d < %d < %d\n",
ferr("ERROR: Too few or too many clusters for FAT16: %d < %d < %d\n",
FAT_MINCLUST16, config->fc_nclusters, maxnclusters - 2);
return -ENFILE;
@@ -622,7 +622,7 @@ mkfatfs_tryfat32(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var,
if ((config->fc_nclusters + 3 > maxnclusters) ||
(config->fc_nclusters < FAT_MINCLUST32))
{
ferr("Too few or too many clusters for FAT32: %d < %d < %d\n",
ferr("ERROR: Too few or too many clusters for FAT32: %d < %d < %d\n",
FAT_MINCLUST32, config->fc_nclusters, maxnclusters - 3);
return -ENFILE;
@@ -696,7 +696,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
if (fmt->ff_rsvdseccount < 2)
{
ferr("At least 2 reserved sectors needed by FAT32\n");
ferr("ERROR: At least 2 reserved sectors needed by FAT32\n");
fatconfig32.fc_rsvdseccount = 2;
}
else
@@ -756,7 +756,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
if (mkfatfs_tryfat12(fmt, var, &fatconfig12) != 0)
{
ferr("Cannot format FAT12 at %u sectors/cluster\n",
ferr("ERROR: Cannot format FAT12 at %u sectors/cluster\n",
1 << fmt->ff_clustshift);
fatconfig12.fc_nfatsects = 0;
@@ -772,7 +772,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
if (mkfatfs_tryfat16(fmt, var, &fatconfig16) != 0)
{
ferr("Cannot format FAT16 at %u sectors/cluster\n",
ferr("ERROR: Cannot format FAT16 at %u sectors/cluster\n",
1 << fmt->ff_clustshift);
fatconfig16.fc_nfatsects = 0;
@@ -828,7 +828,7 @@ mkfatfs_clustersearch(FAR struct fat_format_s *fmt, FAR struct fat_var_s *var)
if (mkfatfs_tryfat32(fmt, var, &fatconfig32) != 0)
{
ferr("Cannot format FAT32 at %u sectors/cluster\n",
ferr("ERROR: Cannot format FAT32 at %u sectors/cluster\n",
1 << fmt->ff_clustshift);
fatconfig32.fc_nfatsects = 0;
@@ -940,7 +940,7 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
if (fmt->ff_backupboot <= 1 || fmt->ff_backupboot >= fmt->ff_rsvdseccount)
{
ferr("Invalid backup boot sector: %d\n", fmt->ff_backupboot);
ferr("ERROR: Invalid backup boot sector: %d\n", fmt->ff_backupboot);
fmt->ff_backupboot = 0;
}
@@ -974,21 +974,21 @@ int mkfatfs_configfatfs(FAR struct fat_format_s *fmt,
/* Describe the configured filesystem */
#ifdef CONFIG_DEBUG_FEATURES
ferr("Sector size: %d bytes\n", var->fv_sectorsize);
ferr("Number of sectors: %d sectors\n", fmt->ff_nsectors);
ferr("FAT size: %d bits\n", var->fv_fattype);
ferr("Number FATs: %d\n", fmt->ff_nfats);
ferr("Sectors per cluster: %d sectors\n", 1 << fmt->ff_clustshift);
ferr("FS size: %d sectors\n", var->fv_nfatsects);
ferr(" %d clusters\n", var->fv_nclusters);
finfo("Sector size: %d bytes\n", var->fv_sectorsize);
finfo("Number of sectors: %d sectors\n", fmt->ff_nsectors);
finfo("FAT size: %d bits\n", var->fv_fattype);
finfo("Number FATs: %d\n", fmt->ff_nfats);
finfo("Sectors per cluster: %d sectors\n", 1 << fmt->ff_clustshift);
finfo("FS size: %d sectors\n", var->fv_nfatsects);
finfo(" %d clusters\n", var->fv_nclusters);
if (var->fv_fattype != 32)
{
ferr("Root directory slots: %d\n", fmt->ff_rootdirentries);
finfo("Root directory slots: %d\n", fmt->ff_rootdirentries);
}
ferr("Volume ID: %08x\n", fmt->ff_volumeid);
ferr("Volume Label: \"%c%c%c%c%c%c%c%c%c%c%c\"\n",
finfo("Volume ID: %08x\n", fmt->ff_volumeid);
finfo("Volume Label: \"%c%c%c%c%c%c%c%c%c%c%c\"\n",
fmt->ff_volumelabel[0], fmt->ff_volumelabel[1], fmt->ff_volumelabel[2],
fmt->ff_volumelabel[3], fmt->ff_volumelabel[4], fmt->ff_volumelabel[5],
fmt->ff_volumelabel[6], fmt->ff_volumelabel[7], fmt->ff_volumelabel[8],
fs/fat/fs_fat32.c
+2 -2
View File
@@ -624,7 +624,7 @@ fat_read_restart:
if (ret == -EFAULT && !force_indirect)
{
ferr("DMA: read alignment error, restarting indirect\n");
ferr("ERROR: DMA read alignment error, restarting indirect\n");
force_indirect = true;
goto fat_read_restart;
}
@@ -884,7 +884,7 @@ fat_write_restart:
if (ret == -EFAULT && !force_indirect)
{
ferr("DMA: write alignment error, restarting indirect\n");
ferr("ERROR: DMA write alignment error, restarting indirect\n");
force_indirect = true;
goto fat_write_restart;
}
fs/fat/fs_fat32util.c
+17 -17
View File
@@ -623,7 +623,7 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
if (i > 3)
{
ferr("No valid MBR\n");
ferr("ERROR: No valid MBR\n");
ret = -EINVAL;
goto errout_with_buffer;
}
@@ -644,22 +644,22 @@ int fat_mount(struct fat_mountpt_s *fs, bool writeable)
/* We did it! */
ferr("FAT%d:\n", fs->fs_type == 0 ? 12 : fs->fs_type == 1 ? 16 : 32);
ferr("\tHW sector size: %d\n", fs->fs_hwsectorsize);
ferr("\t sectors: %d\n", fs->fs_hwnsectors);
ferr("\tFAT reserved: %d\n", fs->fs_fatresvdseccount);
ferr("\t sectors: %d\n", fs->fs_fattotsec);
ferr("\t start sector: %d\n", fs->fs_fatbase);
ferr("\t root sector: %d\n", fs->fs_rootbase);
ferr("\t root entries: %d\n", fs->fs_rootentcnt);
ferr("\t data sector: %d\n", fs->fs_database);
ferr("\t FSINFO sector: %d\n", fs->fs_fsinfo);
ferr("\t Num FATs: %d\n", fs->fs_fatnumfats);
ferr("\t FAT sectors: %d\n", fs->fs_nfatsects);
ferr("\t sectors/cluster: %d\n", fs->fs_fatsecperclus);
ferr("\t max clusters: %d\n", fs->fs_nclusters);
ferr("\tFSI free count %d\n", fs->fs_fsifreecount);
ferr("\t next free %d\n", fs->fs_fsinextfree);
finfo("FAT%d:\n", fs->fs_type == 0 ? 12 : fs->fs_type == 1 ? 16 : 32);
finfo("\tHW sector size: %d\n", fs->fs_hwsectorsize);
finfo("\t sectors: %d\n", fs->fs_hwnsectors);
finfo("\tFAT reserved: %d\n", fs->fs_fatresvdseccount);
finfo("\t sectors: %d\n", fs->fs_fattotsec);
finfo("\t start sector: %d\n", fs->fs_fatbase);
finfo("\t root sector: %d\n", fs->fs_rootbase);
finfo("\t root entries: %d\n", fs->fs_rootentcnt);
finfo("\t data sector: %d\n", fs->fs_database);
finfo("\t FSINFO sector: %d\n", fs->fs_fsinfo);
finfo("\t Num FATs: %d\n", fs->fs_fatnumfats);
finfo("\t FAT sectors: %d\n", fs->fs_nfatsects);
finfo("\t sectors/cluster: %d\n", fs->fs_fatsecperclus);
finfo("\t max clusters: %d\n", fs->fs_nclusters);
finfo("\tFSI free count %d\n", fs->fs_fsifreecount);
finfo("\t next free %d\n", fs->fs_fsinextfree);
return OK;