From: adilger <adilger>
Date: Fri, 12 Sep 2003 00:59:55 +0000 (+0000)
Subject: Merge crash after IO error fix.
X-Git-Tag: 0.9.1~251
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=34a7e070bc9098b0b9f50c2c62e3ad9d483ac9d3;p=fs%2Flustre-release.git

Merge crash after IO error fix.
b=1871
---

diff --git a/lustre/kernel_patches/patches/extN-wantedi.patch b/lustre/kernel_patches/patches/extN-wantedi.patch
index d40d678..c5772fb 100644
--- a/lustre/kernel_patches/patches/extN-wantedi.patch
+++ b/lustre/kernel_patches/patches/extN-wantedi.patch
@@ -58,7 +58,7 @@
  {
  	struct super_block * sb;
  	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);
  
  	lock_super (sb);
@@ -71,8 +71,10 @@
 +		gdp = ext3_get_group_desc(sb, i, &bh2);
 +
 +		bitmap_nr = load_inode_bitmap (sb, i);
-+		if (bitmap_nr < 0)
++		if (bitmap_nr < 0) {
++			err = bitmap_nr;
 +			goto fail;
++		}
 +
 +		bh = EXT3_SB(sb)->s_inode_bitmap[bitmap_nr];
 +