diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 04:11:38 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-24 04:11:38 (GMT) |
| commit | 343800e7d20944aead238c2c6e3f7789f8b6587c (patch) | |
| tree | b40a5cb36c156e8c0aa28bbd8cf92e87e5a4ef95 /fs/fat/fatent.c | |
| parent | f4e0bcf06b9771af04273473592aeeb860ca2816 (diff) | |
| parent | f68e542f3478147986a9c8958942ec649dc06201 (diff) | |
| download | linux-343800e7d20944aead238c2c6e3f7789f8b6587c.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6:
fat: Fix statfs->f_namelen
fat: Replace all printk with fat_msg()
fat: Add fat_msg() function for preformated FAT messages
fat: Convert fat_fs_error to use %pV
fat: Fix possible null deref in fat_cache_add()
fat: use new setup() for ->dir_ops too
Diffstat (limited to 'fs/fat/fatent.c')
| -rw-r--r-- | fs/fat/fatent.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |