From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, linux-mm@kvack.org,
netdev@vger.kernel.org, trond.myklebust@fys.uio.no,
neilb@suse.de, miklos@szeredi.hu, penberg@cs.helsinki.fi,
a.p.zijlstra@chello.nl
Subject: [PATCH 04/30] mm: slub: trivial cleanups
Date: Thu, 20 Mar 2008 21:10:46 +0100 [thread overview]
Message-ID: <20080320202120.871053000@chello.nl> (raw)
In-Reply-To: <20080320201042.675090000@chello.nl>
[-- Attachment #1: cleanup-slub.patch --]
[-- Type: text/plain, Size: 2075 bytes --]
some cleanups..
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
mm/slub.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
Index: linux-2.6/mm/slub.c
===================================================================
--- linux-2.6.orig/mm/slub.c
+++ linux-2.6/mm/slub.c
@@ -25,7 +25,7 @@
/*
* Lock order:
* 1. slab_lock(page)
- * 2. slab->list_lock
+ * 2. node->list_lock
*
* The slab_lock protects operations on the object of a particular
* slab and its metadata in the page struct. If the slab lock
@@ -1058,8 +1058,7 @@ static struct page *allocate_slab(struct
return page;
}
-static void setup_object(struct kmem_cache *s, struct page *page,
- void *object)
+static void setup_object(struct kmem_cache *s, struct page *page, void *object)
{
setup_object_debug(s, page, object);
if (unlikely(s->ctor))
@@ -1205,8 +1204,7 @@ static __always_inline int slab_trylock(
/*
* Management of partially allocated slabs
*/
-static void add_partial(struct kmem_cache_node *n,
- struct page *page, int tail)
+static void add_partial(struct kmem_cache_node *n, struct page *page, int tail)
{
spin_lock(&n->list_lock);
n->nr_partial++;
@@ -1217,8 +1215,7 @@ static void add_partial(struct kmem_cach
spin_unlock(&n->list_lock);
}
-static void remove_partial(struct kmem_cache *s,
- struct page *page)
+static void remove_partial(struct kmem_cache *s, struct page *page)
{
struct kmem_cache_node *n = get_node(s, page_to_nid(page));
@@ -1233,7 +1230,8 @@ static void remove_partial(struct kmem_c
*
* Must hold list_lock.
*/
-static inline int lock_and_freeze_slab(struct kmem_cache_node *n, struct page *page)
+static inline
+int lock_and_freeze_slab(struct kmem_cache_node *n, struct page *page)
{
if (slab_trylock(page)) {
list_del(&page->lru);
--
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2008-03-20 20:10 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-03-20 20:10 [PATCH 00/30] Swap over NFS -v17 Peter Zijlstra
2008-03-20 20:10 ` [PATCH 01/30] swap over network documentation Peter Zijlstra, Neil Brown
2008-03-20 21:20 ` Randy Dunlap
2008-03-20 20:10 ` [PATCH 02/30] mm: gfp_to_alloc_flags() Peter Zijlstra
2008-03-20 20:10 ` [PATCH 03/30] mm: tag reseve pages Peter Zijlstra
2008-03-20 20:10 ` Peter Zijlstra [this message]
2008-03-20 20:10 ` [PATCH 05/30] mm: slb: add knowledge of reserve pages Peter Zijlstra
2008-03-20 20:10 ` [PATCH 06/30] mm: kmem_alloc_estimate() Peter Zijlstra
2008-03-20 20:10 ` [PATCH 07/30] mm: allow PF_MEMALLOC from softirq context Peter Zijlstra
2008-03-20 20:10 ` [PATCH 08/30] mm: serialize access to min_free_kbytes Peter Zijlstra
2008-03-20 20:10 ` [PATCH 09/30] mm: emergency pool Peter Zijlstra
2008-03-20 20:10 ` [PATCH 10/30] mm: system wide ALLOC_NO_WATERMARK Peter Zijlstra
2008-03-20 20:10 ` [PATCH 11/30] mm: __GFP_MEMALLOC Peter Zijlstra
2008-03-20 20:10 ` [PATCH 12/30] mm: memory reserve management Peter Zijlstra
2008-03-20 20:10 ` [PATCH 13/30] selinux: tag avc cache alloc as non-critical Peter Zijlstra
2008-03-20 20:10 ` [PATCH 14/30] net: wrap sk->sk_backlog_rcv() Peter Zijlstra
2008-03-20 20:10 ` [PATCH 15/30] net: packet split receive api Peter Zijlstra
2008-03-20 20:10 ` [PATCH 16/30] net: sk_allocation() - concentrate socket related allocations Peter Zijlstra
2008-03-20 20:10 ` [PATCH 17/30] netvm: network reserve infrastructure Peter Zijlstra
2008-03-20 20:11 ` [PATCH 18/30] netvm: INET reserves Peter Zijlstra
2008-03-20 20:11 ` [PATCH 19/30] netvm: hook skb allocation to reserves Peter Zijlstra
2008-03-20 20:11 ` [PATCH 20/30] netvm: filter emergency skbs Peter Zijlstra
2008-03-20 20:11 ` [PATCH 21/30] netvm: prevent a stream specific deadlock Peter Zijlstra
2008-03-20 20:11 ` [PATCH 22/30] netfilter: NF_QUEUE vs emergency skbs Peter Zijlstra
2008-03-20 20:11 ` [PATCH 23/30] netvm: skb processing Peter Zijlstra
2008-03-20 20:11 ` [PATCH 24/30] mm: add support for non block device backed swap files Peter Zijlstra
2008-03-20 20:11 ` [PATCH 25/30] mm: methods for teaching filesystems about PG_swapcache pages Peter Zijlstra
2008-03-20 20:11 ` [PATCH 26/30] nfs: remove mempools Peter Zijlstra
2008-03-20 20:11 ` [PATCH 27/30] nfs: teach the NFS client how to treat PG_swapcache pages Peter Zijlstra
2008-03-20 20:11 ` [PATCH 28/30] nfs: disable data cache revalidation for swapfiles Peter Zijlstra
2008-03-20 20:11 ` [PATCH 29/30] nfs: enable swap on NFS Peter Zijlstra
2008-03-20 20:11 ` [PATCH 30/30] nfs: fix various memory recursions possible with swap over NFS Peter Zijlstra
2008-07-24 14:00 [PATCH 00/30] Swap over NFS -v18 Peter Zijlstra
2008-07-24 14:00 ` [PATCH 04/30] mm: slub: trivial cleanups Peter Zijlstra
2008-07-28 9:43 ` Pekka Enberg
2008-07-28 10:19 ` Peter Zijlstra
2008-07-30 13:59 ` Christoph Lameter
2008-07-30 14:13 ` Peter Zijlstra
2008-07-29 22:15 ` Pekka Enberg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20080320202120.871053000@chello.nl \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=miklos@szeredi.hu \
--cc=neilb@suse.de \
--cc=netdev@vger.kernel.org \
--cc=penberg@cs.helsinki.fi \
--cc=torvalds@linux-foundation.org \
--cc=trond.myklebust@fys.uio.no \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox