diff options
author | Glauber Costa <glommer@parallels.com> | 2012-04-25 19:01:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-26 00:26:33 -0400 |
commit | 61065a30af8df4b8989c2ac7a1f4b4034e4df2d5 (patch) | |
tree | 3b446b3d81e996ce15901a57e85bab10fcbd8899 | |
parent | 904249aa68010c8e223263c922fcbb840a3f42e4 (diff) |
fs/buffer.c: remove BUG() in possible but rare condition
While stressing the kernel with with failing allocations today, I hit the
following chain of events:
alloc_page_buffers():
bh = alloc_buffer_head(GFP_NOFS);
if (!bh)
goto no_grow; <= path taken
grow_dev_page():
bh = alloc_page_buffers(page, size, 0);
if (!bh)
goto failed; <= taken, consequence of the above
and then the failed path BUG()s the kernel.
The failure is inserted a litte bit artificially, but even then, I see no
reason why it should be deemed impossible in a real box.
Even though this is not a condition that we expect to see around every
time, failed allocations are expected to be handled, and BUG() sounds just
too much. As a matter of fact, grow_dev_page() can return NULL just fine
in other circumstances, so I propose we just remove it, then.
Signed-off-by: Glauber Costa <glommer@parallels.com>
Cc: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | fs/buffer.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 36d66653b931..351e18ea2e53 100644 --- a/fs/buffer.c +++ b/fs/buffer.c | |||
@@ -985,7 +985,6 @@ grow_dev_page(struct block_device *bdev, sector_t block, | |||
985 | return page; | 985 | return page; |
986 | 986 | ||
987 | failed: | 987 | failed: |
988 | BUG(); | ||
989 | unlock_page(page); | 988 | unlock_page(page); |
990 | page_cache_release(page); | 989 | page_cache_release(page); |
991 | return NULL; | 990 | return NULL; |