Skip to content
Snippets Groups Projects
Commit 34a7e070 authored by Andreas Dilger's avatar Andreas Dilger
Browse files

Merge crash after IO error fix.

b=1871
parent 1a14b2f6
No related branches found
No related tags found
No related merge requests found
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
{ {
struct super_block * sb; struct super_block * sb;
struct buffer_head * bh; struct buffer_head * bh;
@@ -323,7 +324,39 @@ struct inode * ext3_new_inode (handle_t @@ -323,7 +324,41 @@ struct inode * ext3_new_inode (handle_t
init_rwsem(&inode->u.ext3_i.truncate_sem); init_rwsem(&inode->u.ext3_i.truncate_sem);
lock_super (sb); lock_super (sb);
...@@ -71,8 +71,10 @@ ...@@ -71,8 +71,10 @@
+ gdp = ext3_get_group_desc(sb, i, &bh2); + gdp = ext3_get_group_desc(sb, i, &bh2);
+ +
+ bitmap_nr = load_inode_bitmap (sb, i); + bitmap_nr = load_inode_bitmap (sb, i);
+ if (bitmap_nr < 0) + if (bitmap_nr < 0) {
+ err = bitmap_nr;
+ goto fail; + goto fail;
+ }
+ +
+ bh = EXT3_SB(sb)->s_inode_bitmap[bitmap_nr]; + bh = EXT3_SB(sb)->s_inode_bitmap[bitmap_nr];
+ +
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment