Merge branch 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm

* 'slub-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/christoph/vm:
  Explain kmem_cache_cpu fields
  SLUB: Do not upset lockdep
  SLUB: Fix coding style violations
  Add parameter to add_partial to avoid having two functions
  SLUB: rename defrag to remote_node_defrag_ratio
  Move count_partial before kmem_cache_shrink
  SLUB: Fix sysfs refcounting
  slub: fix shadowed variable sparse warnings

1 files changed, 9 insertions, 6 deletions

diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index 40801e754afb..ddb1a706b144 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -12,11 +12,11 @@
 #include <linux/kobject.h>
 
 struct kmem_cache_cpu {
-        void **freelist;
-        struct page *page;
-        int node;
-        unsigned int offset;
-        unsigned int objsize;
+        void **freelist;        /* Pointer to first free per cpu object */
+        struct page *page;      /* The slab from which we are allocating */
+        int node;               /* The node of the page (or -1 for debug) */
+        unsigned int offset;    /* Freepointer offset (in word units) */
+        unsigned int objsize;   /* Size of an object (from kmem_cache) */
 };
 
 struct kmem_cache_node {
@@ -59,7 +59,10 @@ struct kmem_cache {
 #endif
 
 #ifdef CONFIG_NUMA
-        int defrag_ratio;
+        /*
+         * Defragmentation by allocating from a remote node.
+         */
+        int remote_node_defrag_ratio;
         struct kmem_cache_node *node[MAX_NUMNODES];
 #endif
 #ifdef CONFIG_SMP