summaryrefslogtreecommitdiff
path: root/include/linux/buffer_head.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@home.osdl.org>2004-01-19 05:36:00 -0800
committerLinus Torvalds <torvalds@home.osdl.org>2004-01-19 05:36:00 -0800
commitdfb754ee9854da301b6de62f02c4a494e3404e45 (patch)
tree01c40ca577973665d9936158f499d7c64de91c82 /include/linux/buffer_head.h
parent5a8d6ecf62b3ef2a0cde434e9bfdd33b76c07496 (diff)
parentd52531b8e75f705d889060fdeb15898d655cd9b3 (diff)
Merge bk://kernel.bkbits.net/gregkh/linux/driver-2.6
into home.osdl.org:/home/torvalds/v2.5/linux
Diffstat (limited to 'include/linux/buffer_head.h')
-rw-r--r--include/linux/buffer_head.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 5f4b675a7bb4..110584f07883 100644
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -125,8 +125,7 @@ BUFFER_FNS(Write_EIO,write_io_error)
/* If we *know* page->private refers to buffer_heads */
#define page_buffers(page) \
({ \
- if (!PagePrivate(page)) \
- BUG(); \
+ BUG_ON(!PagePrivate(page)); \
((struct buffer_head *)(page)->private); \
})
#define page_has_buffers(page) PagePrivate(page)