From patchwork Sat Aug 5 16:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 131511 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c44e:0:b0:3f2:4152:657d with SMTP id w14csp554736vqr; Sat, 5 Aug 2023 10:08:48 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHnunZw1dbcwmhtE9I75at5tELVPXgN0ZqEbi32iPsPhS2umOLhfoW7g04HxH2yUGdSuEzH X-Received: by 2002:a17:907:2723:b0:99c:1ed1:65b2 with SMTP id d3-20020a170907272300b0099c1ed165b2mr3742715ejl.33.1691255327877; Sat, 05 Aug 2023 10:08:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1691255327; cv=none; d=google.com; s=arc-20160816; b=C9NNcCRgTc5gtfZrcnsRRt1m/r7Ej2uPj7VosQJjT1cuxAHFT0azNtuusW0QbpdCGo BlcFlnrgy4Nk9MnaVWBojVO5n463TUr84eJSz99MXLc/2ub6TN6uuM9735zDgxaH5KEy aA/TU0C9QMwveGIH8t2G5A/lG+ulGBIGnc3I18kHsVGFD84EJfBYJPkcDq5k+ZEYD9fK KNUCxlZ+jiQJ3s599uz9soTPSht/u4KAFLiKpUE0dw9/hp4ZfbyEQedF7rAkUsiyE/ax KFP6dagZPayUVgNk/FdVFriit/AKm1bNcVSl0WlHYVnlAkCR0F6plsgUyMLGV1BxhA7S fVQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:to:from:date; bh=/17mzegf8JZHibMrzQvxR5LoTlQRR3yQ0c1DUaT3IG0=; fh=WrF5P4rt5GKLKZXFPrBfHwP5VFIZG8GPN/h4vsvn4l4=; b=OhoeIhpnTiCHMO5gC3Pw4Haoh1LYKZno9YeErgFAfGIzQ0GqLf1oYyMzSEiJKMLIDu 6Jru0KcTvSMFnDDLjmnmu8jIS2Ur8kOL0uVP77aaKDfiNWH6xav8lMIvoA3VlhDQfX+D 3jkbId1D5I/JOYcLfTR5NSwhvisj++1mHRkhkDMFEFHcg5rdBPlDUmRjOHpdGVIeaevI toEEdEwYHp4skYnOSBDHcz15IQJS0mWFuDMarRFcii5fAS0BzKsXAldVEJVwMsz6wAI2 s4WtRXP0F/t3UZJxReQI40JCO0kszuDHhs7Dfuof7Ah8ZvK+ofD8/++q84b6GH2NOC6B etBw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j10-20020a170906094a00b0099bcae257e3si3265911ejd.832.2023.08.05.10.08.23; Sat, 05 Aug 2023 10:08:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229817AbjHEQXp (ORCPT + 99 others); Sat, 5 Aug 2023 12:23:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229771AbjHEQXn (ORCPT ); Sat, 5 Aug 2023 12:23:43 -0400 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 31F304206 for ; Sat, 5 Aug 2023 09:23:37 -0700 (PDT) Received: from local by pidgin.makrotopia.org with esmtpsa (TLS1.3:TLS_AES_256_GCM_SHA384:256) (Exim 4.96) (envelope-from ) id 1qSK3x-0000dT-10; Sat, 05 Aug 2023 16:23:33 +0000 Date: Sat, 5 Aug 2023 17:23:25 +0100 From: Daniel Golle To: Randy Dunlap , Richard Weinberger , Miquel Raynal , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH v2 2/7] mtd: ubi: block: don't return on error when removing Message-ID: References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773409746909304469 X-GMAIL-MSGID: 1773409746909304469 There is no point on returning the error from ubiblock_remove in case it is being called due to a volume removal event -- the volume is gone, we should destroy and remove the ubiblock device no matter what. Introduce new boolean parameter 'force' to tell ubiblock_remove to go on even in case the ubiblock device is still busy. Use that new option when calling ubiblock_remove due to a UBI_VOLUME_REMOVED event. Signed-off-by: Daniel Golle --- drivers/mtd/ubi/block.c | 6 +++--- drivers/mtd/ubi/cdev.c | 2 +- drivers/mtd/ubi/ubi.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/ubi/block.c b/drivers/mtd/ubi/block.c index 437c5b83ffe51..69fa6fecb8494 100644 --- a/drivers/mtd/ubi/block.c +++ b/drivers/mtd/ubi/block.c @@ -456,7 +456,7 @@ static void ubiblock_cleanup(struct ubiblock *dev) idr_remove(&ubiblock_minor_idr, dev->gd->first_minor); } -int ubiblock_remove(struct ubi_volume_info *vi) +int ubiblock_remove(struct ubi_volume_info *vi, bool force) { struct ubiblock *dev; int ret; @@ -470,7 +470,7 @@ int ubiblock_remove(struct ubi_volume_info *vi) /* Found a device, let's lock it so we can check if it's busy */ mutex_lock(&dev->dev_mutex); - if (dev->refcnt > 0) { + if (dev->refcnt > 0 && !force) { ret = -EBUSY; goto out_unlock_dev; } @@ -545,7 +545,7 @@ static int ubiblock_notify(struct notifier_block *nb, */ break; case UBI_VOLUME_REMOVED: - ubiblock_remove(&nt->vi); + ubiblock_remove(&nt->vi, true); break; case UBI_VOLUME_RESIZED: ubiblock_resize(&nt->vi); diff --git a/drivers/mtd/ubi/cdev.c b/drivers/mtd/ubi/cdev.c index f43430b9c1e65..bb55e863dd296 100644 --- a/drivers/mtd/ubi/cdev.c +++ b/drivers/mtd/ubi/cdev.c @@ -572,7 +572,7 @@ static long vol_cdev_ioctl(struct file *file, unsigned int cmd, struct ubi_volume_info vi; ubi_get_volume_info(desc, &vi); - err = ubiblock_remove(&vi); + err = ubiblock_remove(&vi, false); break; } diff --git a/drivers/mtd/ubi/ubi.h b/drivers/mtd/ubi/ubi.h index c8f1bd4fa1008..44c0eeaf1e1b0 100644 --- a/drivers/mtd/ubi/ubi.h +++ b/drivers/mtd/ubi/ubi.h @@ -979,7 +979,7 @@ static inline void ubi_fastmap_destroy_checkmap(struct ubi_volume *vol) {} int ubiblock_init(void); void ubiblock_exit(void); int ubiblock_create(struct ubi_volume_info *vi); -int ubiblock_remove(struct ubi_volume_info *vi); +int ubiblock_remove(struct ubi_volume_info *vi, bool force); #else static inline int ubiblock_init(void) { return 0; } static inline void ubiblock_exit(void) {} @@ -987,7 +987,7 @@ static inline int ubiblock_create(struct ubi_volume_info *vi) { return -ENOSYS; } -static inline int ubiblock_remove(struct ubi_volume_info *vi) +static inline int ubiblock_remove(struct ubi_volume_info *vi, bool force) { return -ENOSYS; }