Re: [PATCH 6/6] KVM: PPC: e500: Rename jump labels in kvmppc_e500_tlb_init()

Julia Lawall
2016-08-28T17:48:31Z

On Sun, 28 Aug 2016, SF Markus Elfring wrote:

> From: Markus Elfring <elfring@users.sourceforge.net>
> Date: Sun, 28 Aug 2016 18:45:26 +0200
>
> Adjust jump labels according to the current Linux coding style convention.
>
> Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
> ---
> arch/powerpc/kvm/e500_mmu.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/arch/powerpc/kvm/e500_mmu.c b/arch/powerpc/kvm/e500_mmu.c
> index 0a2eeb1..da8f22b 100644
> --- a/arch/powerpc/kvm/e500_mmu.c
> +++ b/arch/powerpc/kvm/e500_mmu.c
> @@ -933,26 +933,25 @@ int kvmppc_e500_tlb_init(struct kvmppc_vcpu_e500 *vcpu_e500)
> sizeof(struct tlbe_ref),
> GFP_KERNEL);
> if (!vcpu_e500->gtlb_priv[0])
> - goto err;
> + goto free_vcpu;
>
> vcpu_e500->gtlb_priv[1] = kcalloc(vcpu_e500->gtlb_params[1].entries,
> sizeof(struct tlbe_ref),
> GFP_KERNEL);
> if (!vcpu_e500->gtlb_priv[1])
> - goto err;
> + goto free_vcpu;
>
> vcpu_e500->g2h_tlb1_map = kcalloc(vcpu_e500->gtlb_params[1].entries,
> sizeof(*vcpu_e500->g2h_tlb1_map),
> GFP_KERNEL);
> if (!vcpu_e500->g2h_tlb1_map)
> - goto err;
> + goto free_vcpu;
>
> vcpu_mmu_init(vcpu, vcpu_e500->gtlb_params);
>
> kvmppc_recalc_tlb1map_range(vcpu_e500);
> return 0;
> -
> -err:
> + free_vcpu:
> free_gtlb(vcpu_e500);
> return -1;

I doubt that -1 is the best return value. One could guess that it should
be -ENOMEM. But see what the call sites expect.

julia

> }
> --
> 2.9.3
>
> --
> To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>