From: Christoph Lameter Date: Thu, 17 May 2007 05:10:56 +0000 (-0700) Subject: SLUB: Do our own flags based on PG_active and PG_error X-Git-Tag: v2.6.22-rc2~55 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5577bd8a85c8b7643a241789b14fafa9c8a6c7db;p=linux-2.6-omap-h63xx.git SLUB: Do our own flags based on PG_active and PG_error The atomicity when handling flags in SLUB is not necessary since both flags used by SLUB are not updated in a racy way. Flag updates are either done during slab creation or destruction or under slab_lock. Some of these flags do not have the non atomic variants that we need. So define our own. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/mm/slub.c b/mm/slub.c index ce96d485a88..3ca164f3396 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -99,42 +99,42 @@ * the fast path and disables lockless freelists. */ +#define FROZEN (1 << PG_active) + +#ifdef CONFIG_SLUB_DEBUG +#define SLABDEBUG (1 << PG_error) +#else +#define SLABDEBUG 0 +#endif + static inline int SlabFrozen(struct page *page) { - return PageActive(page); + return page->flags & FROZEN; } static inline void SetSlabFrozen(struct page *page) { - SetPageActive(page); + page->flags |= FROZEN; } static inline void ClearSlabFrozen(struct page *page) { - ClearPageActive(page); + page->flags &= ~FROZEN; } static inline int SlabDebug(struct page *page) { -#ifdef CONFIG_SLUB_DEBUG - return PageError(page); -#else - return 0; -#endif + return page->flags & SLABDEBUG; } static inline void SetSlabDebug(struct page *page) { -#ifdef CONFIG_SLUB_DEBUG - SetPageError(page); -#endif + page->flags |= SLABDEBUG; } static inline void ClearSlabDebug(struct page *page) { -#ifdef CONFIG_SLUB_DEBUG - ClearPageError(page); -#endif + page->flags &= ~SLABDEBUG; } /*