[PATCH] remove set_page_buffers() and clear_page_buffers()

The set_page_buffers() and clear_page_buffers() macros are each used in
only one place.  Fold them into their callers.

diff --git a/fs/buffer.c b/fs/buffer.c
index 70025ee603a64210a3fd07ef6f1ab4e33e59e211..a47863b3bd8a80cbe7380ab210d7ceeb349be645 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -152,14 +152,16 @@ __set_page_buffers(struct page *page, struct buffer_head *head)
 {
        if (page_has_buffers(page))
                buffer_error();
-       set_page_buffers(page, head);
        page_cache_get(page);
+       SetPagePrivate(page);
+       page->private = (unsigned long)head;
 }
 
 static inline void
 __clear_page_buffers(struct page *page)
 {
-       clear_page_buffers(page);
+       ClearPagePrivate(page);
+       page->private = 0;
        page_cache_release(page);
 }
 

diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h
index 96207c0d6dce3a9cec4ac849d1874383e53ff415..903850460ab5c28fa7371d3b25777e7da0863c3e 100644 (file)
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
@@ -119,16 +119,6 @@ BUFFER_FNS(Boundary, boundary)
                ((struct buffer_head *)(page)->private);        \
        })
 #define page_has_buffers(page) PagePrivate(page)
-#define set_page_buffers(page, buffers)                                \
-       do {                                                    \
-               SetPagePrivate(page);                           \
-               page->private = (unsigned long)buffers;         \
-       } while (0)
-#define clear_page_buffers(page)                               \
-       do {                                                    \
-               ClearPagePrivate(page);                         \
-               page->private = 0;                              \
-       } while (0)
 
 #define invalidate_buffers(dev)        __invalidate_buffers((dev), 0)
 #define destroy_buffers(dev)   __invalidate_buffers((dev), 1)