Move printing the header to s_start, removing the need for the special
pointer value.
-- Brian Gerst
diff -urN linux-2.5.62-bk2/mm/slab.c linux/mm/slab.c --- linux-2.5.62-bk2/mm/slab.c 2003-02-18 01:30:26.000000000 -0500 +++ linux/mm/slab.c 2003-02-22 11:45:35.000000000 -0500 @@ -2194,10 +2194,19 @@ struct list_head *p; down(&cache_chain_sem); - if (!n) - return (void *)1; + if (!n) { + /* + * Output format version, so at least we can change it + * without _too_ many complaints. + */ + seq_puts(m, "slabinfo - version: 1.2" +#if STATS + " (statistics)" +#endif + "\n"); + } p = cache_chain.next; - while (--n) { + while (n--) { p = p->next; if (p == &cache_chain) return NULL; @@ -2209,8 +2218,6 @@ { kmem_cache_t *cachep = p; ++*pos; - if (p == (void *)1) - return list_entry(cache_chain.next, kmem_cache_t, next); return cachep->next.next == &cache_chain ? NULL : list_entry(cachep->next.next, kmem_cache_t, next); } @@ -2234,20 +2241,6 @@ mm_segment_t old_fs; char tmp; - - if (p == (void*)1) { - /* - * Output format version, so at least we can change it - * without _too_ many complaints. - */ - seq_puts(m, "slabinfo - version: 1.2" -#if STATS - " (statistics)" -#endif - "\n"); - return 0; - } - check_irq_on(); spin_lock_irq(&cachep->spinlock); active_objs = 0;
- 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 Feb 23 2003 - 22:00:36 EST