This patch makes use of ALIGN() to remove duplicate round-up code. Signed-off-by: Canjiang Lu <canjiang...@samsung.com> --- mm/slab.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/mm/slab.c b/mm/slab.c index 807d86c..69e08a4 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -2040,17 +2040,13 @@ static bool set_on_slab_cache(struct kmem_cache *cachep, * unaligned accesses for some archs when redzoning is used, and makes * sure any on-slab bufctl's are also correctly aligned. */ - if (size & (BYTES_PER_WORD - 1)) { - size += (BYTES_PER_WORD - 1); - size &= ~(BYTES_PER_WORD - 1); - } + size = ALIGN(size, BYTES_PER_WORD); if (flags & SLAB_RED_ZONE) { ralign = REDZONE_ALIGN; /* If redzoning, ensure that the second redzone is suitably * aligned, by adjusting the object size accordingly. */ - size += REDZONE_ALIGN - 1; - size &= ~(REDZONE_ALIGN - 1); + size = ALIGN(size, REDZONE_ALIGN); } /* 3) caller mandated alignment */ -- 1.9.1