[PATCH] fat: fix error message for bogus number of directory entries

[PATCH] fat: fix error message for bogus number of directory entries

[Zheng Lv]

"bogus directory-entries per block" was reported for what was instead
bogus number of directory entries. The message also mismatched the
argument passed to printk(), which was sbi->dir_entries.

Fix this by replacing the message with "bogus number of directory
entries". printk() argument was kept unchanged.

Signed-off-by: Zheng Lv <lv.zheng.2015@gmail.com>
Cc: trivial@kernel.org
---
Note that this patch would possibly confuse users who receive the error message from an old kernel but grep in the patched source tree. However, I think this case is rare enough to be ignored.


 fs/fat/inode.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/fat/inode.c b/fs/fat/inode.c
index 3bcf579..d26a5ce 100644
--- a/fs/fat/inode.c
+++ b/fs/fat/inode.c
@@ -1726,7 +1726,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
 	sbi->dir_entries = bpb.fat_dir_entries;
 	if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
 		if (!silent)
-			fat_msg(sb, KERN_ERR, "bogus directory-entries per block"
+			fat_msg(sb, KERN_ERR, "bogus number of directory entries"
 			       " (%u)", sbi->dir_entries);
 		goto out_invalid;
 	}
-- 
2.7.4

Re: [PATCH] fat: fix error message for bogus number of directory entries

[OGAWA Hirofumi]

Zheng Lv <lv.zheng.2015@gmail.com> writes:

> "bogus directory-entries per block" was reported for what was instead
> bogus number of directory entries. The message also mismatched the
> argument passed to printk(), which was sbi->dir_entries.
>
> Fix this by replacing the message with "bogus number of directory
> entries". printk() argument was kept unchanged.
>
> Signed-off-by: Zheng Lv <lv.zheng.2015@gmail.com>
> Cc: trivial@kernel.org

Acked-by: OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>

> ---
> Note that this patch would possibly confuse users who receive the error message from an old kernel but grep in the patched source tree. However, I think this case is rare enough to be ignored.
>
>
>  fs/fat/inode.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/fat/inode.c b/fs/fat/inode.c
> index 3bcf579..d26a5ce 100644
> --- a/fs/fat/inode.c
> +++ b/fs/fat/inode.c
> @@ -1726,7 +1726,7 @@ int fat_fill_super(struct super_block *sb, void *data, int silent, int isvfat,
>  	sbi->dir_entries = bpb.fat_dir_entries;
>  	if (sbi->dir_entries & (sbi->dir_per_block - 1)) {
>  		if (!silent)
> -			fat_msg(sb, KERN_ERR, "bogus directory-entries per block"
> +			fat_msg(sb, KERN_ERR, "bogus number of directory entries"
>  			       " (%u)", sbi->dir_entries);
>  		goto out_invalid;
>  	}

-- 
OGAWA Hirofumi <hirofumi@mail.parknet.co.jp>