diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-30 01:58:18 -0500 |
| commit | f0612bbc41f65f5a684f69d714a1a17a6f0f40c5 (patch) | |
| tree | 8c070070bb355843cfa4635643e9da7c2c4cd44a /include/linux/buffer_head.h | |
| parent | b0c4e148bd591629749d02a8fbc8d81c26d548cf (diff) | |
| parent | 81cfb8864c73230eb1c37753aba517db15cf4d8f (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'include/linux/buffer_head.h')
| -rw-r--r-- | include/linux/buffer_head.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 88af42f5e04a..c937d6e65502 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h | |||
| @@ -126,8 +126,8 @@ BUFFER_FNS(Eopnotsupp, eopnotsupp) | |||
| 126 | /* If we *know* page->private refers to buffer_heads */ | 126 | /* If we *know* page->private refers to buffer_heads */ |
| 127 | #define page_buffers(page) \ | 127 | #define page_buffers(page) \ |
| 128 | ({ \ | 128 | ({ \ |
| 129 | BUG_ON(!PagePrivate(page)); \ | 129 | BUG_ON(!PagePrivate(page)); \ |
| 130 | ((struct buffer_head *)(page)->private); \ | 130 | ((struct buffer_head *)page_private(page)); \ |
| 131 | }) | 131 | }) |
| 132 | #define page_has_buffers(page) PagePrivate(page) | 132 | #define page_has_buffers(page) PagePrivate(page) |
| 133 | 133 | ||
| @@ -219,7 +219,7 @@ static inline void attach_page_buffers(struct page *page, | |||
| 219 | { | 219 | { |
| 220 | page_cache_get(page); | 220 | page_cache_get(page); |
| 221 | SetPagePrivate(page); | 221 | SetPagePrivate(page); |
| 222 | page->private = (unsigned long)head; | 222 | set_page_private(page, (unsigned long)head); |
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | static inline void get_bh(struct buffer_head *bh) | 225 | static inline void get_bh(struct buffer_head *bh) |