From: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
To: Alexey Fisher <bug-track@fisher-privat.net>
Cc: <linux-kernel@vger.kernel.org>, joe@perches.com
Subject: Re: [PATCH 2/2 v2] Unify rest of FAT messages.
Date: Wed, 10 Nov 2010 20:40:04 +0900 [thread overview]
Message-ID: <87hbfppfu3.fsf@devron.myhome.or.jp> (raw)
In-Reply-To: <1289329470-14454-1-git-send-email-bug-track@fisher-privat.net> (Alexey Fisher's message of "Tue, 9 Nov 2010 20:04:30 +0100")
Alexey Fisher <bug-track@fisher-privat.net> writes:
> Here is how it looks like after patch.
This is going to unify the all FSes (e.g. fat_msg() uses fs_msg("FAT", ...))?
If so, I think it's welcome. If not, umm, it looks like good but...
Thanks.
> [50334.635174] FAT-fs (loop0): utf8 is not a recommended IO charset for FAT filesystems, filesystem will be case sensitive!
> [50334.635178]
> [50334.635606] FAT-fs (loop0): Invalid FSINFO signature: 0x00000000, 0x00000000 (sector = 1)
> [50334.635666] FAT-fs (loop0): Mounted. Opts: iocharset=utf8
> [50342.129047] FAT-fs (loop0): error, invalid access to FAT (entry 0x9e90a346)
> [50342.129306] FAT-fs (loop0): error, invalid access to FAT (entry 0xa35ced48)
>
> v2 - more protoype to other patch
>
> Signed-off-by: Alexey Fisher <bug-track@fisher-privat.net>
> ---
> fs/fat/dir.c | 9 ++++---
> fs/fat/fatent.c | 4 +-
> fs/fat/inode.c | 68 +++++++++++++++++++++++++++---------------------------
> fs/fat/misc.c | 14 +++++------
> 4 files changed, 47 insertions(+), 48 deletions(-)
>
> diff --git a/fs/fat/dir.c b/fs/fat/dir.c
> index ee42b9e..4d1d9e3 100644
> --- a/fs/fat/dir.c
> +++ b/fs/fat/dir.c
> @@ -98,7 +98,7 @@ next:
>
> *bh = sb_bread(sb, phys);
> if (*bh == NULL) {
> - printk(KERN_ERR "FAT: Directory bread(block %llu) failed\n",
> + fat_msg(sb, KERN_ERR, "Directory bread(block %llu) failed",
> (llu)phys);
> /* skip this block */
> *pos = (iblock + 1) << sb->s_blocksize_bits;
> @@ -979,6 +979,7 @@ static int __fat_remove_entries(struct inode *dir, loff_t pos, int nr_slots)
>
> int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
> {
> + struct super_block *sb = dir->i_sb;
> struct msdos_dir_entry *de;
> struct buffer_head *bh;
> int err = 0, nr_slots;
> @@ -1013,8 +1014,8 @@ int fat_remove_entries(struct inode *dir, struct fat_slot_info *sinfo)
> */
> err = __fat_remove_entries(dir, sinfo->slot_off, nr_slots);
> if (err) {
> - printk(KERN_WARNING
> - "FAT: Couldn't remove the long name slots\n");
> + fat_msg(sb, KERN_WARNING,
> + "Couldn't remove the long name slots");
> }
> }
>
> @@ -1265,7 +1266,7 @@ int fat_add_entries(struct inode *dir, void *slots, int nr_slots,
> if (sbi->fat_bits != 32)
> goto error;
> } else if (MSDOS_I(dir)->i_start == 0) {
> - printk(KERN_ERR "FAT: Corrupted directory (i_pos %lld)\n",
> + fat_msg(sb, KERN_ERR, "Corrupted directory (i_pos %lld)",
> MSDOS_I(dir)->i_pos);
> err = -EIO;
> goto error;
> diff --git a/fs/fat/fatent.c b/fs/fat/fatent.c
> index b47d2c9..2e81ac0 100644
> --- a/fs/fat/fatent.c
> +++ b/fs/fat/fatent.c
> @@ -95,7 +95,7 @@ static int fat12_ent_bread(struct super_block *sb, struct fat_entry *fatent,
> err_brelse:
> brelse(bhs[0]);
> err:
> - printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n", (llu)blocknr);
> + fat_msg(sb, KERN_ERR, "FAT read failed (blocknr %llu)", (llu)blocknr);
> return -EIO;
> }
>
> @@ -108,7 +108,7 @@ static int fat_ent_bread(struct super_block *sb, struct fat_entry *fatent,
> fatent->fat_inode = MSDOS_SB(sb)->fat_inode;
> fatent->bhs[0] = sb_bread(sb, blocknr);
> if (!fatent->bhs[0]) {
> - printk(KERN_ERR "FAT: FAT read failed (blocknr %llu)\n",
> + fat_msg(sb, KERN_ERR, "FAT read failed (blocknr %llu)",
> (llu)blocknr);
> return -EIO;
> }
> diff --git a/fs/fat/inode.c b/fs/fat/inode.c
> index a4e8f26..f799b00 100644
> --- a/fs/fat/inode.c
> +++ b/fs/fat/inode.c
> @@ -633,8 +633,8 @@ retry:
>
> bh = sb_bread(sb, i_pos >> sbi->dir_per_block_bits);
> if (!bh) {
> - printk(KERN_ERR "FAT: unable to read inode block "
> - "for updating (i_pos %lld)\n", i_pos);
> + fat_msg(sb, KERN_ERR, "unable to read inode block "
> + "for updating (i_pos %lld)", i_pos);
> return -EIO;
> }
> spin_lock(&sbi->inode_hash_lock);
> @@ -994,8 +994,8 @@ static const match_table_t vfat_tokens = {
> {Opt_err, NULL}
> };
>
> -static int parse_options(char *options, int is_vfat, int silent, int *debug,
> - struct fat_mount_options *opts)
> +static int parse_options(struct super_block *sb, char *options, int is_vfat,
> + int silent, int *debug, struct fat_mount_options *opts)
> {
> char *p;
> substring_t args[MAX_OPT_ARGS];
> @@ -1186,15 +1186,15 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
>
> /* obsolete mount options */
> case Opt_obsolate:
> - printk(KERN_INFO "FAT: \"%s\" option is obsolete, "
> - "not supported now\n", p);
> + fat_msg(sb, KERN_INFO, "\"%s\" option is obsolete, "
> + "not supported now", p);
> break;
> /* unknown option */
> default:
> if (!silent) {
> - printk(KERN_ERR
> - "FAT: Unrecognized mount option \"%s\" "
> - "or missing value\n", p);
> + fat_msg(sb, KERN_ERR,
> + "Unrecognized mount option \"%s\" "
> + "or missing value", p);
> }
> return -EINVAL;
> }
> @@ -1203,7 +1203,7 @@ static int parse_options(char *options, int is_vfat, int silent, int *debug,
> out:
> /* UTF-8 doesn't provide FAT semantics */
> if (!strcmp(opts->iocharset, "utf8")) {
> - printk(KERN_ERR "FAT: utf8 is not a recommended IO charset"
> + fat_msg(sb, KERN_ERR, "utf8 is not a recommended IO charset"
> " for FAT filesystems, filesystem will be "
> "case sensitive!\n");
> }
> @@ -1290,7 +1290,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> ratelimit_state_init(&sbi->ratelimit, DEFAULT_RATELIMIT_INTERVAL,
> DEFAULT_RATELIMIT_BURST);
>
> - error = parse_options(data, isvfat, silent, &debug, &sbi->options);
> + error = parse_options(sb, data, isvfat, silent, &debug, &sbi->options);
> if (error)
> goto out_fail;
>
> @@ -1298,20 +1298,21 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> sb_min_blocksize(sb, 512);
> bh = sb_bread(sb, 0);
> if (bh == NULL) {
> - printk(KERN_ERR "FAT: unable to read boot sector\n");
> + fat_msg(sb, KERN_ERR, "unable to read boot sector");
> goto out_fail;
> }
>
> b = (struct fat_boot_sector *) bh->b_data;
> if (!b->reserved) {
> if (!silent)
> - printk(KERN_ERR "FAT: bogus number of reserved sectors\n");
> + fat_msg(sb,
> + KERN_ERR, "bogus number of reserved sectors");
> brelse(bh);
> goto out_invalid;
> }
> if (!b->fats) {
> if (!silent)
> - printk(KERN_ERR "FAT: bogus number of FAT structure\n");
> + fat_msg(sb, KERN_ERR, "bogus number of FAT structure");
> brelse(bh);
> goto out_invalid;
> }
> @@ -1324,7 +1325,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> media = b->media;
> if (!fat_valid_media(media)) {
> if (!silent)
> - printk(KERN_ERR "FAT: invalid media value (0x%02x)\n",
> + fat_msg(sb, KERN_ERR, "invalid media value (0x%02x)",
> media);
> brelse(bh);
> goto out_invalid;
> @@ -1334,7 +1335,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> || (logical_sector_size < 512)
> || (logical_sector_size > 4096)) {
> if (!silent)
> - printk(KERN_ERR "FAT: bogus logical sector size %u\n",
> + fat_msg(sb, KERN_ERR, "bogus logical sector size %u",
> logical_sector_size);
> brelse(bh);
> goto out_invalid;
> @@ -1342,15 +1343,15 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> sbi->sec_per_clus = b->sec_per_clus;
> if (!is_power_of_2(sbi->sec_per_clus)) {
> if (!silent)
> - printk(KERN_ERR "FAT: bogus sectors per cluster %u\n",
> + fat_msg(sb, KERN_ERR, "bogus sectors per cluster %u",
> sbi->sec_per_clus);
> brelse(bh);
> goto out_invalid;
> }
>
> if (logical_sector_size < sb->s_blocksize) {
> - printk(KERN_ERR "FAT: logical sector size too small for device"
> - " (logical sector size = %u)\n", logical_sector_size);
> + fat_msg(sb, KERN_ERR, "logical sector size too small for device"
> + " (logical sector size = %u)", logical_sector_size);
> brelse(bh);
> goto out_fail;
> }
> @@ -1358,14 +1359,14 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> brelse(bh);
>
> if (!sb_set_blocksize(sb, logical_sector_size)) {
> - printk(KERN_ERR "FAT: unable to set blocksize %u\n",
> + fat_msg(sb, KERN_ERR, "unable to set blocksize %u",
> logical_sector_size);
> goto out_fail;
> }
> bh = sb_bread(sb, 0);
> if (bh == NULL) {
> - printk(KERN_ERR "FAT: unable to read boot sector"
> - " (logical sector size = %lu)\n",
> + fat_msg(sb, KERN_ERR, "unable to read boot sector"
> + " (logical sector size = %lu)",
> sb->s_blocksize);
> goto out_fail;
> }
> @@ -1401,16 +1402,16 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
>
> fsinfo_bh = sb_bread(sb, sbi->fsinfo_sector);
> if (fsinfo_bh == NULL) {
> - printk(KERN_ERR "FAT: bread failed, FSINFO block"
> - " (sector = %lu)\n", sbi->fsinfo_sector);
> + fat_msg(sb, KERN_ERR, "bread failed, FSINFO block"
> + " (sector = %lu)", sbi->fsinfo_sector);
> brelse(bh);
> goto out_fail;
> }
>
> fsinfo = (struct fat_boot_fsinfo *)fsinfo_bh->b_data;
> if (!IS_FSINFO(fsinfo)) {
> - printk(KERN_WARNING "FAT: Invalid FSINFO signature: "
> - "0x%08x, 0x%08x (sector = %lu)\n",
> + fat_msg(sb, KERN_WARNING, "Invalid FSINFO signature: "
> + "0x%08x, 0x%08x (sector = %lu)",
> le32_to_cpu(fsinfo->signature1),
> le32_to_cpu(fsinfo->signature2),
> sbi->fsinfo_sector);
> @@ -1431,8 +1432,8 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> sbi->dir_entries = get_unaligned_le16(&b->dir_entries);
> if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
> if (!silent)
> - printk(KERN_ERR "FAT: bogus directroy-entries per block"
> - " (%u)\n", sbi->dir_entries);
> + fat_msg(sb, KERN_ERR, "bogus directroy-entries per block"
> + " (%u)", sbi->dir_entries);
> brelse(bh);
> goto out_invalid;
> }
> @@ -1454,7 +1455,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> total_clusters = min(total_clusters, fat_clusters - FAT_START_ENT);
> if (total_clusters > MAX_FAT(sb)) {
> if (!silent)
> - printk(KERN_ERR "FAT: count of clusters too big (%u)\n",
> + fat_msg(sb, KERN_ERR, "count of clusters too big (%u)",
> total_clusters);
> brelse(bh);
> goto out_invalid;
> @@ -1487,7 +1488,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> sprintf(buf, "cp%d", sbi->options.codepage);
> sbi->nls_disk = load_nls(buf);
> if (!sbi->nls_disk) {
> - printk(KERN_ERR "FAT: codepage %s not found\n", buf);
> + fat_msg(sb, KERN_ERR, "codepage %s not found", buf);
> goto out_fail;
> }
>
> @@ -1495,7 +1496,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> if (sbi->options.isvfat) {
> sbi->nls_io = load_nls(sbi->options.iocharset);
> if (!sbi->nls_io) {
> - printk(KERN_ERR "FAT: IO charset %s not found\n",
> + fat_msg(sb, KERN_ERR, "IO charset %s not found",
> sbi->options.iocharset);
> goto out_fail;
> }
> @@ -1519,7 +1520,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> insert_inode_hash(root_inode);
> sb->s_root = d_alloc_root(root_inode);
> if (!sb->s_root) {
> - printk(KERN_ERR "FAT: get root inode failed\n");
> + fat_msg(sb, KERN_ERR, "get root inode failed");
> goto out_fail;
> }
>
> @@ -1531,8 +1532,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent,
> out_invalid:
> error = -EINVAL;
> if (!silent)
> - printk(KERN_INFO "VFS: Can't find a valid FAT filesystem"
> - " on dev %s.\n", sb->s_id);
> + fat_msg(sb, KERN_INFO, "Can't find a valid FAT filesystem");
>
> out_fail:
> if (fat_inode)
> diff --git a/fs/fat/misc.c b/fs/fat/misc.c
> index 970e682..8e043a1 100644
> --- a/fs/fat/misc.c
> +++ b/fs/fat/misc.c
> @@ -26,9 +26,7 @@ void __fat_fs_error(struct super_block *s, int report, const char *fmt, ...)
> va_list args;
>
> if (report) {
> - printk(KERN_ERR "FAT: Filesystem error (dev %s)\n", s->s_id);
> -
> - printk(KERN_ERR " ");
> + printk(KERN_ERR "FAT-fs (%s): error, ", s->s_id);
> va_start(args, fmt);
> vprintk(fmt, args);
> va_end(args);
> @@ -36,10 +34,10 @@ void __fat_fs_error(struct super_block *s, int report, const char *fmt, ...)
> }
>
> if (opts->errors == FAT_ERRORS_PANIC)
> - panic("FAT: fs panic from previous error\n");
> + panic("FAT-fs (%s): fs panic from previous error\n", s->s_id);
> else if (opts->errors == FAT_ERRORS_RO && !(s->s_flags & MS_RDONLY)) {
> s->s_flags |= MS_RDONLY;
> - printk(KERN_ERR "FAT: Filesystem has been set read-only\n");
> + fat_msg(s, KERN_ERR, "Filesystem has been set read-only");
> }
> }
> EXPORT_SYMBOL_GPL(__fat_fs_error);
> @@ -57,15 +55,15 @@ int fat_clusters_flush(struct super_block *sb)
>
> bh = sb_bread(sb, sbi->fsinfo_sector);
> if (bh == NULL) {
> - printk(KERN_ERR "FAT: bread failed in fat_clusters_flush\n");
> + fat_msg(sb, KERN_ERR, "bread failed in fat_clusters_flush");
> return -EIO;
> }
>
> fsinfo = (struct fat_boot_fsinfo *)bh->b_data;
> /* Sanity check */
> if (!IS_FSINFO(fsinfo)) {
> - printk(KERN_ERR "FAT: Invalid FSINFO signature: "
> - "0x%08x, 0x%08x (sector = %lu)\n",
> + fat_msg(sb, KERN_ERR, "Invalid FSINFO signature: "
> + "0x%08x, 0x%08x (sector = %lu)",
> le32_to_cpu(fsinfo->signature1),
> le32_to_cpu(fsinfo->signature2),
> sbi->fsinfo_sector);
--
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>
next prev parent reply other threads:[~2010-11-10 11:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 16:55 [PATCH 0/2] FAT unified kernel messages Alexey Fisher
2010-11-09 16:55 ` [PATCH 1/2] Introduce fat_msg() for " Alexey Fisher
2010-11-09 17:25 ` Joe Perches
2010-11-09 17:56 ` Wolfram Sang
2010-11-09 18:58 ` [PATCH 1/2] Idd fat_msg() to unified kernel messages for FAT fs Alexey Fisher
2010-11-09 19:43 ` Joe Perches
2010-11-10 10:23 ` [PATCH 1/4] Convert fat_fs_error to use %pV Alexey Fisher
2010-11-10 10:32 ` Andreas Schwab
2010-11-10 10:23 ` [PATCH 2/4] Add fat_msg() function for preformated FAT messages Alexey Fisher
2010-11-10 10:23 ` [PATCH 3/4] Replace all printk with fat_msg() Alexey Fisher
2010-11-10 10:23 ` [PATCH 4/4] Report each FAT mount and mount options Alexey Fisher
2010-11-10 11:33 ` [PATCH 1/2] Idd fat_msg() to unified kernel messages for FAT fs OGAWA Hirofumi
2010-11-09 16:55 ` [PATCH 2/2] Unify rest of FAT messages Alexey Fisher
2010-11-09 19:04 ` [PATCH 2/2 v2] " Alexey Fisher
2010-11-10 11:40 ` OGAWA Hirofumi [this message]
2010-11-10 12:41 ` Alexey Fisher
2010-11-10 13:53 ` OGAWA Hirofumi
2010-11-10 15:07 ` Alexey Fisher
2010-11-10 16:40 ` OGAWA Hirofumi
2010-11-10 16:58 ` Alexey Fisher
2010-11-10 20:53 ` OGAWA Hirofumi
2011-02-24 8:04 ` Alexey Fisher
2011-03-02 14:17 ` OGAWA Hirofumi
2010-11-09 17:03 ` [PATCH 0/2] FAT unified kernel messages Randy Dunlap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87hbfppfu3.fsf@devron.myhome.or.jp \
--to=hirofumi@mail.parknet.co.jp \
--cc=bug-track@fisher-privat.net \
--cc=joe@perches.com \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.