clear_obj_pfmemalloc() takes the pointer to the object pointer as argument
to store masked value back into this address.
But this is useless, since we don't use this stored value anymore.
All we need is just masked value. So makes clear_obj_pfmemalloc()
just return masked value.
Signed-off-by: Joonsoo Kim <iamjoonsoo....@lge.com>
diff --git a/mm/slab.c b/mm/slab.c
index 5906f8f..6d17cad 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -215,9 +215,9 @@ static inline void set_obj_pfmemalloc(void **objp)
return;
}
-static inline void clear_obj_pfmemalloc(void **objp)
+static inline void *clear_obj_pfmemalloc(void *objp)
{
- *objp = (void *)((unsigned long)*objp & ~SLAB_OBJ_PFMEMALLOC);
+ return (void *)((unsigned long)objp & ~SLAB_OBJ_PFMEMALLOC);
}
/*
@@ -810,7 +810,7 @@ static void *__ac_get_obj(struct kmem_cache *cachep, struct
array_cache *ac,
struct kmem_cache_node *n;
if (gfp_pfmemalloc_allowed(flags)) {
- clear_obj_pfmemalloc(&objp);
+ objp = clear_obj_pfmemalloc(objp);
return objp;
}
@@ -833,7 +833,7 @@ static void *__ac_get_obj(struct kmem_cache *cachep, struct
array_cache *ac,
if (!list_empty(&n->slabs_free) && force_refill) {
struct page *page = virt_to_head_page(objp);
ClearPageSlabPfmemalloc(page);
- clear_obj_pfmemalloc(&objp);
+ objp = clear_obj_pfmemalloc(objp);
recheck_pfmemalloc_active(cachep, ac);
return objp;
}
@@ -3365,8 +3365,7 @@ static void free_block(struct kmem_cache *cachep, void
**objpp, int nr_objects,
void *objp;
struct page *page;
- clear_obj_pfmemalloc(&objpp[i]);
- objp = objpp[i];
+ objp = clear_obj_pfmemalloc(objpp[i]);
page = virt_to_head_page(objp);
n = cachep->node[node];
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
