Merge ../linux-2.6 by hand

1 files changed, 4 insertions, 0 deletions

diff --git a/fs/ext2/inode.c b/fs/ext2/inode.c
index fdba4d1d3c60..e7d3f0522d01 100644
--- a/fs/ext2/inode.c
+++ b/fs/ext2/inode.c
@@ -440,6 +440,10 @@ static int ext2_alloc_branch(struct inode *inode,
                  * the pointer to new one, then send parent to disk.
                  */
                 bh = sb_getblk(inode->i_sb, parent);
+                if (!bh) {
+                        err = -EIO;
+                        break;
+                }
                 lock_buffer(bh);
                 memset(bh->b_data, 0, blocksize);
                 branch[n].bh = bh;