From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6BCFC4332F for ; Mon, 6 Sep 2021 17:10:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C405960F70 for ; Mon, 6 Sep 2021 17:10:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242944AbhIFRL4 (ORCPT ); Mon, 6 Sep 2021 13:11:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41356 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243965AbhIFRLx (ORCPT ); Mon, 6 Sep 2021 13:11:53 -0400 Received: from mail-lj1-x22d.google.com (mail-lj1-x22d.google.com [IPv6:2a00:1450:4864:20::22d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BF4D2C061575 for ; Mon, 6 Sep 2021 10:10:48 -0700 (PDT) Received: by mail-lj1-x22d.google.com with SMTP id w4so12279532ljh.13 for ; Mon, 06 Sep 2021 10:10:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=eBV6xJO0OJaH8jzRZsLqKsR9gePhFCKXaYbJlTL1SK0=; b=LFms5S3j0LvWEYimyPf3cb4Aisdn+Fk0RcpOrMN+ZdxUItBFt03MZgAJyCUWWC62gA xL6pVj/R4056hMSTJXWaAAW0XJxWY95ANL2inlfc7gjmf6BFW8UdEkjBN6OfL9igtewV 2JgY9QMy4BbUAgVA1jm1THz+5T5uS585jDOW2nVtjNTStboUZCsKHDlx3pvPga5s2Aea dvtTuh0M4AIM0YiFHE2rv2jMoWzeXBDMGduAbcmjYKzTNfr7wM1AzhSBU6ieiQ9XTDvy XQyK9QeN2IRddAghms+zRMV1up63wzN38bLJRWblvnD5e2vOcie3vnIumG6eir16lfbi jm5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=eBV6xJO0OJaH8jzRZsLqKsR9gePhFCKXaYbJlTL1SK0=; b=Aw/iTQ4LKZ6MDu+7fQsi2rkmSS8GujBXYgGiSm1DlQwagiTgeSGqxF3NNVdMkfUPWo li0EH6D3s+Epw38D4v8hO2K1QUTNfUuNRe//3GscZJwJf/4HRkU4iejp6Y8a5zWjvZNu r6K5DPQrKukNLa0bpUa0NfWni6ifk3h4Phv660PxS3FHyPcuekDMW6rBgAV6FY4IKoPx FxrbncYjkwiVNovW7SF6wWiNs60yvTL/ToZPBU6nalUaOj2p+e1+sS1E/rryIJ6azShU xd2wrDkil/W9HCOpEZBcwso1u++EE5d0lnjgT+h+Xs3hbmC1bVfUWq8//UrxBqE0urU6 MIaQ== X-Gm-Message-State: AOAM533f2eqAS3h0SUU1W9H1UJ/ecFsV3HgMwfgZVGwxniFyjWCZME5t t/rTYSQl3HCWHNjmtM5UlhoBiHi//1FUC4aYaAnckw== X-Google-Smtp-Source: ABdhPJxhSEFI8wMN4u5XHazx2hzbbCQEPxdsCfALNn+wlwsdQueMDsoHtriqduJghpS67u2M98pG6gst9sXWJqwHE5o= X-Received: by 2002:a05:651c:1b3:: with SMTP id c19mr11757010ljn.16.1630948247165; Mon, 06 Sep 2021 10:10:47 -0700 (PDT) MIME-Version: 1.0 References: <20210830212538.148729-1-mcgrof@kernel.org> <20210830212538.148729-5-mcgrof@kernel.org> In-Reply-To: <20210830212538.148729-5-mcgrof@kernel.org> From: Ulf Hansson Date: Mon, 6 Sep 2021 19:10:10 +0200 Message-ID: Subject: Re: [PATCH v3 4/8] mmc/core/block: add error handling support for add_disk() To: Luis Chamberlain Cc: Jens Axboe , "Martin K . Petersen" , "James E.J. Bottomley" , kbusch@kernel.org, sagi@grimberg.me, Adrian Hunter , "Bean Huo (beanhuo)" , Avri Altman , Stephen Boyd , agk@redhat.com, Mike Snitzer , Josef Bacik , Christoph Hellwig , Hannes Reinecke , Bart Van Assche , Ming Lei , linux-scsi , linux-nvme@lists.infradead.org, linux-mmc , dm-devel@redhat.com, nbd@other.debian.org, linux-block , Linux Kernel Mailing List Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 30 Aug 2021 at 23:26, Luis Chamberlain wrote: > > We never checked for errors on add_disk() as this function > returned void. Now that this is fixed, use the shiny new > error handling. > > The caller only cleanups the disk if we pass on an allocated md > but on error we return return ERR_PTR(ret), and so we must do all > the unwinding ourselves. > > Signed-off-by: Luis Chamberlain Queued for v5.16 on the temporary devel branch, thanks! Kind regards Uffe > --- > drivers/mmc/core/block.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c > index 6a15fdf6e5f2..9b2856aa6231 100644 > --- a/drivers/mmc/core/block.c > +++ b/drivers/mmc/core/block.c > @@ -2453,9 +2453,14 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, > /* used in ->open, must be set before add_disk: */ > if (area_type == MMC_BLK_DATA_AREA_MAIN) > dev_set_drvdata(&card->dev, md); > - device_add_disk(md->parent, md->disk, mmc_disk_attr_groups); > + ret = device_add_disk(md->parent, md->disk, mmc_disk_attr_groups); > + if (ret) > + goto err_cleanup_queue; > return md; > > + err_cleanup_queue: > + blk_cleanup_queue(md->disk->queue); > + blk_mq_free_tag_set(&md->queue.tag_set); > err_kfree: > kfree(md); > out: > -- > 2.30.2 >