[patch 14/19] remove set_page_buffers() and clear_page_buffers()

From: Andrew Morton (akpm@zip.com.au)
Date: Mon Jun 17 2002 - 01:53:18 EST


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

--- 2.5.22/include/linux/buffer_head.h~move-set_page_buffers Sun Jun 16 23:12:51 2002
+++ 2.5.22-akpm/include/linux/buffer_head.h Sun Jun 16 23:22:44 2002
@@ -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)
--- 2.5.22/fs/buffer.c~move-set_page_buffers Sun Jun 16 23:12:51 2002
+++ 2.5.22-akpm/fs/buffer.c Sun Jun 16 23:22:44 2002
@@ -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);
 }
 

-
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Sun Jun 23 2002 - 22:00:12 EST