On Fri, Nov 11, 2011 at 10:07 PM, Christoph Lameter <cl@xxxxxxxxx> wrote:
> Simplify control flow.
>
> Signed-off-by: Christoph Lameter <cl@xxxxxxxxx>
Would like to merge this too.
> ---
> mm/slub.c | 16 ++++++++--------
> 1 file changed, 8 insertions(+), 8 deletions(-)
>
> Index: linux-2.6/mm/slub.c
> ===================================================================
> --- linux-2.6.orig/mm/slub.c 2011-11-09 11:11:22.381541568 -0600
> +++ linux-2.6/mm/slub.c 2011-11-09 11:11:25.881561697 -0600
> @@ -2219,16 +2219,16 @@ new_slab:
>
> freelist = get_partial(s, gfpflags, node, c);
>
> - if (unlikely(!freelist)) {
> + if (!freelist)
> freelist = new_slab_objects(s, gfpflags, node, &c);
>
> - if (unlikely(!freelist)) {
> - if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
> - slab_out_of_memory(s, gfpflags, node);
> -
> - local_irq_restore(flags);
> - return NULL;
> - }
> +
> + if (unlikely(!freelist)) {
> + if (!(gfpflags & __GFP_NOWARN) && printk_ratelimit())
> + slab_out_of_memory(s, gfpflags, node);
> +
> + local_irq_restore(flags);
> + return NULL;
> }
>
> if (likely(!kmem_cache_debug(s)))
>
> --
> To unsubscribe, send a message with 'unsubscribe linux-mm' in
> the body to majordomo@xxxxxxxxx. For more info on Linux MM,
> see: http://www.linux-mm.org/ .
> Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
> Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>
>
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href