diff options
| author | Jan Blunck <jblunck@suse.de> | 2010-04-14 14:38:33 +0200 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2010-05-21 19:30:38 +0200 |
| commit | 2b8120efb2d41e2aefce3b06cf3fd085f71e9021 (patch) | |
| tree | 638dece002c64eed3758e909bca7328d6ab728f7 /fs/ext2 | |
| parent | 41d1a636b813867339db52e12377ca132d54700f (diff) | |
| download | linux-stable-2b8120efb2d41e2aefce3b06cf3fd085f71e9021.tar.gz linux-stable-2b8120efb2d41e2aefce3b06cf3fd085f71e9021.tar.bz2 linux-stable-2b8120efb2d41e2aefce3b06cf3fd085f71e9021.zip | |
ext2: Use ext2_clear_super_error() in ext2_sync_fs()
ext2_sync_fs() used to duplicate the code from ext2_clear_super_error().
Signed-off-by: Jan Blunck <jblunck@suse.de>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/ext2')
| -rw-r--r-- | fs/ext2/super.c | 20 |
1 files changed, 3 insertions, 17 deletions
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 42e4a303b675..8e8b675ac202 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c @@ -1120,8 +1120,8 @@ static void ext2_clear_super_error(struct super_block *sb) * be remapped. Nothing we can do but to retry the * write and hope for the best. */ - printk(KERN_ERR "EXT2-fs: %s previous I/O error to " - "superblock detected", sb->s_id); + ext2_msg(sb, KERN_ERR, + "previous I/O error to superblock detected\n"); clear_buffer_write_io_error(sbh); set_buffer_uptodate(sbh); } @@ -1161,23 +1161,9 @@ static void ext2_sync_super(struct super_block *sb, struct ext2_super_block *es) static int ext2_sync_fs(struct super_block *sb, int wait) { struct ext2_super_block *es = EXT2_SB(sb)->s_es; - struct buffer_head *sbh = EXT2_SB(sb)->s_sbh; lock_kernel(); - if (buffer_write_io_error(sbh)) { - /* - * Oh, dear. A previous attempt to write the - * superblock failed. This could happen because the - * USB device was yanked out. Or it could happen to - * be a transient write error and maybe the block will - * be remapped. Nothing we can do but to retry the - * write and hope for the best. - */ - ext2_msg(sb, KERN_ERR, - "previous I/O error to superblock detected\n"); - clear_buffer_write_io_error(sbh); - set_buffer_uptodate(sbh); - } + ext2_clear_super_error(sb); if (es->s_state & cpu_to_le16(EXT2_VALID_FS)) { ext2_debug("setting valid to 0\n"); |