leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ext3: Add journal error check in resize.c

Browse Source 
Check return value of ext3_journal_get_write_access() and
ext3_journal_dirty_metadata().

Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Jan Kara <jack@suse.cz>
This commit is contained in:
Namhyung Kim 2010-11-25 01:53:12 +09:00 committed by Jan Kara
parent 055adcbd7d
commit 41dc6385bd
1 changed files with 51 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
fs/ext3/resize.c
View File

@ -249,7 +249,11 @@ static int setup_new_group_blocks(struct super_block *sb,
memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, gdb->b_size); memcpy(gdb->b_data, sbi->s_group_desc[i]->b_data, gdb->b_size);
set_buffer_uptodate(gdb); set_buffer_uptodate(gdb);
unlock_buffer(gdb); unlock_buffer(gdb);
ext3_journal_dirty_metadata(handle, gdb); err = ext3_journal_dirty_metadata(handle, gdb);
if (err) {
brelse(gdb);
goto exit_bh;
}
ext3_set_bit(bit, bh->b_data); ext3_set_bit(bit, bh->b_data);
brelse(gdb); brelse(gdb);
} }
@ -269,7 +273,11 @@ static int setup_new_group_blocks(struct super_block *sb,
err = PTR_ERR(gdb); err = PTR_ERR(gdb);
goto exit_bh; goto exit_bh;
} }
ext3_journal_dirty_metadata(handle, gdb); err = ext3_journal_dirty_metadata(handle, gdb);
if (err) {
brelse(gdb);
goto exit_bh;
}
ext3_set_bit(bit, bh->b_data); ext3_set_bit(bit, bh->b_data);
brelse(gdb); brelse(gdb);
} }
@ -295,7 +303,11 @@ static int setup_new_group_blocks(struct super_block *sb,
err = PTR_ERR(it); err = PTR_ERR(it);
goto exit_bh; goto exit_bh;
} }
ext3_journal_dirty_metadata(handle, it); err = ext3_journal_dirty_metadata(handle, it);
if (err) {
brelse(it);
goto exit_bh;
}
brelse(it); brelse(it);
ext3_set_bit(bit, bh->b_data); ext3_set_bit(bit, bh->b_data);
} }
@ -306,7 +318,9 @@ static int setup_new_group_blocks(struct super_block *sb,
mark_bitmap_end(input->blocks_count, EXT3_BLOCKS_PER_GROUP(sb), mark_bitmap_end(input->blocks_count, EXT3_BLOCKS_PER_GROUP(sb),
bh->b_data); bh->b_data);
ext3_journal_dirty_metadata(handle, bh); err = ext3_journal_dirty_metadata(handle, bh);
if (err)
goto exit_bh;
brelse(bh); brelse(bh);
/* Mark unused entries in inode bitmap used */ /* Mark unused entries in inode bitmap used */
@ -319,7 +333,7 @@ static int setup_new_group_blocks(struct super_block *sb,
mark_bitmap_end(EXT3_INODES_PER_GROUP(sb), EXT3_BLOCKS_PER_GROUP(sb), mark_bitmap_end(EXT3_INODES_PER_GROUP(sb), EXT3_BLOCKS_PER_GROUP(sb),
bh->b_data); bh->b_data);
ext3_journal_dirty_metadata(handle, bh); err = ext3_journal_dirty_metadata(handle, bh);
exit_bh: exit_bh:
brelse(bh); brelse(bh);
@ -503,12 +517,19 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
* reserved inode, and will become GDT blocks (primary and backup). * reserved inode, and will become GDT blocks (primary and backup).
*/ */
data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)] = 0; data[gdb_num % EXT3_ADDR_PER_BLOCK(sb)] = 0;
ext3_journal_dirty_metadata(handle, dind); err = ext3_journal_dirty_metadata(handle, dind);
if (err)
goto exit_group_desc;
brelse(dind); brelse(dind);
dind = NULL;
inode->i_blocks -= (gdbackups + 1) * sb->s_blocksize >> 9; inode->i_blocks -= (gdbackups + 1) * sb->s_blocksize >> 9;
ext3_mark_iloc_dirty(handle, inode, &iloc); err = ext3_mark_iloc_dirty(handle, inode, &iloc);
if (err)
goto exit_group_desc;
memset((*primary)->b_data, 0, sb->s_blocksize); memset((*primary)->b_data, 0, sb->s_blocksize);
ext3_journal_dirty_metadata(handle, *primary); err = ext3_journal_dirty_metadata(handle, *primary);
if (err)
goto exit_group_desc;
o_group_desc = EXT3_SB(sb)->s_group_desc; o_group_desc = EXT3_SB(sb)->s_group_desc;
memcpy(n_group_desc, o_group_desc, memcpy(n_group_desc, o_group_desc,
@ -519,10 +540,14 @@ static int add_new_gdb(handle_t *handle, struct inode *inode,
kfree(o_group_desc); kfree(o_group_desc);
le16_add_cpu(&es->s_reserved_gdt_blocks, -1); le16_add_cpu(&es->s_reserved_gdt_blocks, -1);
ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); err = ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
if (err)
goto exit_inode;
return 0; return 0;
exit_group_desc:
kfree(n_group_desc);
exit_inode: exit_inode:
//ext3_journal_release_buffer(handle, iloc.bh); //ext3_journal_release_buffer(handle, iloc.bh);
brelse(iloc.bh); brelse(iloc.bh);
@ -706,16 +731,20 @@ static void update_backups(struct super_block *sb,
} }
ext3_debug("update metadata backup %#04lx\n", ext3_debug("update metadata backup %#04lx\n",
(unsigned long)bh->b_blocknr); (unsigned long)bh->b_blocknr);
if ((err = ext3_journal_get_write_access(handle, bh))) if ((err = ext3_journal_get_write_access(handle, bh))) {
brelse(bh);
break; break;
}
lock_buffer(bh); lock_buffer(bh);
memcpy(bh->b_data, data, size); memcpy(bh->b_data, data, size);
if (rest) if (rest)
memset(bh->b_data + size, 0, rest); memset(bh->b_data + size, 0, rest);
set_buffer_uptodate(bh); set_buffer_uptodate(bh);
unlock_buffer(bh); unlock_buffer(bh);
ext3_journal_dirty_metadata(handle, bh); err = ext3_journal_dirty_metadata(handle, bh);
brelse(bh); brelse(bh);
if (err)
break;
} }
if ((err2 = ext3_journal_stop(handle)) && !err) if ((err2 = ext3_journal_stop(handle)) && !err)
err = err2; err = err2;
@ -922,7 +951,9 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input)
/* Update the global fs size fields */ /* Update the global fs size fields */
sbi->s_groups_count++; sbi->s_groups_count++;
ext3_journal_dirty_metadata(handle, primary); err = ext3_journal_dirty_metadata(handle, primary);
if (err)
goto exit_journal;
/* Update the reserved block counts only once the new group is /* Update the reserved block counts only once the new group is
* active. */ * active. */
@ -934,7 +965,7 @@ int ext3_group_add(struct super_block *sb, struct ext3_new_group_data *input)
percpu_counter_add(&sbi->s_freeinodes_counter, percpu_counter_add(&sbi->s_freeinodes_counter,
EXT3_INODES_PER_GROUP(sb)); EXT3_INODES_PER_GROUP(sb));
ext3_journal_dirty_metadata(handle, sbi->s_sbh); err = ext3_journal_dirty_metadata(handle, sbi->s_sbh);
exit_journal: exit_journal:
mutex_unlock(&sbi->s_resize_lock); mutex_unlock(&sbi->s_resize_lock);
@ -1064,8 +1095,14 @@ int ext3_group_extend(struct super_block *sb, struct ext3_super_block *es,
goto exit_put; goto exit_put;
} }
es->s_blocks_count = cpu_to_le32(o_blocks_count + add); es->s_blocks_count = cpu_to_le32(o_blocks_count + add);
ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh); err = ext3_journal_dirty_metadata(handle, EXT3_SB(sb)->s_sbh);
mutex_unlock(&EXT3_SB(sb)->s_resize_lock); mutex_unlock(&EXT3_SB(sb)->s_resize_lock);
if (err) {
ext3_warning(sb, __func__,
"error %d on journal dirty metadata", err);
ext3_journal_stop(handle);
goto exit_put;
}
ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n", ext3_debug("freeing blocks "E3FSBLK" through "E3FSBLK"\n",
o_blocks_count, o_blocks_count + add); o_blocks_count, o_blocks_count + add);
ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks); ext3_free_blocks_sb(handle, sb, o_blocks_count, add, &freed_blocks);