diff --git a/[refs] b/[refs] index 577ee2c4aa36..be23f2bcc930 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8c777cc4be1390862d053cbc002246e87572147b +refs/heads/master: e5dd259f78ba0fd0c7bfc5c52179dbbff3eb48aa diff --git a/trunk/fs/reiserfs/file.c b/trunk/fs/reiserfs/file.c index ad6fa964b0e7..1cad5d066a5c 100644 --- a/trunk/fs/reiserfs/file.c +++ b/trunk/fs/reiserfs/file.c @@ -192,6 +192,8 @@ static int reiserfs_allocate_blocks_for_region(struct reiserfs_transaction_handl allocated_blocks = kmalloc((blocks_to_allocate + will_prealloc) * sizeof(b_blocknr_t), GFP_NOFS); + if (!allocated_blocks) + return -ENOMEM; /* First we compose a key to point at the writing position, we want to do that outside of any locking region. */