summaryrefslogtreecommitdiff
path: root/include/linux/buffer_head.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-10-30 09:59:10 +0300
committerJeff Garzik <jgarzik@pobox.com>2005-10-30 09:59:10 +0300
commit9359ede748ff1461bf0632fb4182f61da4a2f9e2 (patch)
tree4ec0c92b4998a535fc1180866a6dff9ad3bbb489 /include/linux/buffer_head.h
parent35ebbae2836a361330b784706b7140c90a346a53 (diff)
parent81cfb8864c73230eb1c37753aba517db15cf4d8f (diff)
downloadlinux-9359ede748ff1461bf0632fb4182f61da4a2f9e2.tar.xz
Merge branch 'upstream'
Diffstat (limited to 'include/linux/buffer_head.h')
-rw-r--r--include/linux/buffer_head.h6
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)
/* If we *know* page->private refers to buffer_heads */
#define page_buffers(page) \
({ \
- BUG_ON(!PagePrivate(page)); \
- ((struct buffer_head *)(page)->private); \
+ BUG_ON(!PagePrivate(page)); \
+ ((struct buffer_head *)page_private(page)); \
})
#define page_has_buffers(page) PagePrivate(page)
@@ -219,7 +219,7 @@ static inline void attach_page_buffers(struct page *page,
{
page_cache_get(page);
SetPagePrivate(page);
- page->private = (unsigned long)head;
+ set_page_private(page, (unsigned long)head);
}
static inline void get_bh(struct buffer_head *bh)