remove set_page_buffers() and clear_page_buffers()
PATCH 14/19 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.
include/linux/buffer_head.h renamed from include/linux/buffer_head.h~move-set_page_buffers +0 -10
@@ -117,16 +117,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)
fs/buffer.c renamed from fs/buffer.c~move-set_page_buffers +4 -2
@@ -152,14 +152,16 @@ __set_page_buffers(struct page *page, st {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); }
-