aboutsummaryrefslogtreecommitdiffstats
path: root/fs
diff options
context:
space:
mode:
Diffstat (limited to 'fs')
-rw-r--r--fs/ext4/dir.c2
-rw-r--r--fs/ext4/super.c10
2 files changed, 6 insertions, 6 deletions
diff --git a/fs/ext4/dir.c b/fs/ext4/dir.c
index cf3ccf4a94b0..2df2e40b01af 100644
--- a/fs/ext4/dir.c
+++ b/fs/ext4/dir.c
@@ -405,7 +405,7 @@ static int call_filldir(struct file *filp, void *dirent,
405 sb = inode->i_sb; 405 sb = inode->i_sb;
406 406
407 if (!fname) { 407 if (!fname) {
408 printk(KERN_ERR "ext4: call_filldir: called with " 408 printk(KERN_ERR "EXT4-fs: call_filldir: called with "
409 "null fname?!?\n"); 409 "null fname?!?\n");
410 return 0; 410 return 0;
411 } 411 }
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 517c90ad25bd..b69d09203865 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -505,7 +505,7 @@ static struct block_device *ext4_blkdev_get(dev_t dev)
505 return bdev; 505 return bdev;
506 506
507fail: 507fail:
508 printk(KERN_ERR "EXT4: failed to open journal device %s: %ld\n", 508 printk(KERN_ERR "EXT4-fs: failed to open journal device %s: %ld\n",
509 __bdevname(dev, b), PTR_ERR(bdev)); 509 __bdevname(dev, b), PTR_ERR(bdev));
510 return NULL; 510 return NULL;
511} 511}
@@ -2485,7 +2485,7 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent)
2485 if (ext4_blocks_count(es) > 0xffffffffULL && 2485 if (ext4_blocks_count(es) > 0xffffffffULL &&
2486 !jbd2_journal_set_features(EXT4_SB(sb)->s_journal, 0, 0, 2486 !jbd2_journal_set_features(EXT4_SB(sb)->s_journal, 0, 0,
2487 JBD2_FEATURE_INCOMPAT_64BIT)) { 2487 JBD2_FEATURE_INCOMPAT_64BIT)) {
2488 printk(KERN_ERR "ext4: Failed to set 64-bit journal feature\n"); 2488 printk(KERN_ERR "EXT4-fs: Failed to set 64-bit journal feature\n");
2489 goto failed_mount4; 2489 goto failed_mount4;
2490 } 2490 }
2491 2491
@@ -2766,7 +2766,7 @@ static journal_t *ext4_get_dev_journal(struct super_block *sb,
2766 2766
2767 if (bd_claim(bdev, sb)) { 2767 if (bd_claim(bdev, sb)) {
2768 printk(KERN_ERR 2768 printk(KERN_ERR
2769 "EXT4: failed to claim external journal device.\n"); 2769 "EXT4-fs: failed to claim external journal device.\n");
2770 blkdev_put(bdev, FMODE_READ|FMODE_WRITE); 2770 blkdev_put(bdev, FMODE_READ|FMODE_WRITE);
2771 return NULL; 2771 return NULL;
2772 } 2772 }
@@ -2949,7 +2949,7 @@ static void ext4_commit_super(struct super_block *sb,
2949 * be remapped. Nothing we can do but to retry the 2949 * be remapped. Nothing we can do but to retry the
2950 * write and hope for the best. 2950 * write and hope for the best.
2951 */ 2951 */
2952 printk(KERN_ERR "ext4: previous I/O error to " 2952 printk(KERN_ERR "EXT4-fs: previous I/O error to "
2953 "superblock detected for %s.\n", sb->s_id); 2953 "superblock detected for %s.\n", sb->s_id);
2954 clear_buffer_write_io_error(sbh); 2954 clear_buffer_write_io_error(sbh);
2955 set_buffer_uptodate(sbh); 2955 set_buffer_uptodate(sbh);
@@ -2965,7 +2965,7 @@ static void ext4_commit_super(struct super_block *sb,
2965 if (sync) { 2965 if (sync) {
2966 sync_dirty_buffer(sbh); 2966 sync_dirty_buffer(sbh);
2967 if (buffer_write_io_error(sbh)) { 2967 if (buffer_write_io_error(sbh)) {
2968 printk(KERN_ERR "ext4: I/O error while writing " 2968 printk(KERN_ERR "EXT4-fs: I/O error while writing "
2969 "superblock for %s.\n", sb->s_id); 2969 "superblock for %s.\n", sb->s_id);
2970 clear_buffer_write_io_error(sbh); 2970 clear_buffer_write_io_error(sbh);
2971 set_buffer_uptodate(sbh); 2971 set_buffer_uptodate(sbh);