From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from bombadil.infradead.org ([198.137.202.9]:43027 "EHLO
	bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752794AbcC3RnN (ORCPT
	<rfc822;stable@vger.kernel.org>); Wed, 30 Mar 2016 13:43:13 -0400
Date: Wed, 30 Mar 2016 10:43:10 -0700
From: Christoph Hellwig <hch@infradead.org>
To: Ming Lei <ming.lei@canonical.com>
Cc: Jens Axboe <axboe@fb.com>, linux-kernel@vger.kernel.org,
	linux-block@vger.kernel.org, Christoph Hellwig <hch@infradead.org>,
	Naveen Kaje <nkaje@codeaurora.org>, stable@vger.kernel.org
Subject: Re: [PATCH] block: partition: initialize percpuref before sending
 out KOBJ_ADD
Message-ID: <20160330174310.GA9544@infradead.org>
References: <1459298791-32447-1-git-send-email-ming.lei@canonical.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1459298791-32447-1-git-send-email-ming.lei@canonical.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

> +	if (err) {
> +		if (flags & ADDPART_FLAG_WHOLEDISK)
> +			goto out_remove_file;
> +		goto out_del;
> +	}

I'd rather have that if around the actual device_remove_file at the
label, and jump to out_remove_file unconditionally.

Otherwise this looks fine to me.