From patchwork Mon Jul 31 19:11:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Golle X-Patchwork-Id: 128847 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2227412vqg; Mon, 31 Jul 2023 12:41:06 -0700 (PDT) X-Google-Smtp-Source: APBJJlEj/TAtlg36u0br1Rhazah8BsnZllcjXnD8gR6s2z0zgrdmEKGdDGpSwAyQhoMJUSOjlTA8 X-Received: by 2002:a17:90b:3807:b0:262:f579:41db with SMTP id mq7-20020a17090b380700b00262f57941dbmr9240256pjb.6.1690832465686; Mon, 31 Jul 2023 12:41:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690832465; cv=none; d=google.com; s=arc-20160816; b=eZnTrqyDVY1s4jLVHjoIGDJRb+5oG9mxnttED4VmtUlC/5V/xjrce5iGZBd7trN/g3 aI94yIhKvft2f7WiC6TxDXrcrrwlyxvu+K597tJznLphl33Y81Tlp5ihPXgSf1K5iLLG iyQvy/ZwTKsDXAHDvi5cG1/BDRV0D8T5CPPOkt4IGudRUuzH+WivfNYj86n1hHgn+mbr WIkal/qzp4ZHNH51cZZ7vKDwDa5GRlgnmlfEY2b5uyQThOLgW7rAsVLBaYallq/19G+E dJf9X9mW9XKVQSOHojWr+yCJlZXWfUqtfC1XZbKE3iQiztVRE9qsTdIVlgzhDT9C0/eU KOqg== 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=kFGsI/e2yvLWxse1j39HJ6gb+i8cDJSBRhHonL9x+u0=; b=bewJwY0Fye/6wJD/Q/vKt3/8ar0fwMfBBEYHZbqCm4MP90ZiV924PzOE7ni545Jz6j DZVwxgXPsHlGEe5PAeJ+RbWcAXvuOK+NFyXcCUTMv8VhHTt64jcqdf5HeFDGAfQSmpGH 0DXZpeouh53vGZWyyypPN/CXqVsy/QszHt2XHe2mMeoWFcygyV7i47TyqBpXfpLWVf/r VMOdS7NJa/B94leAqx6E7ESmzCCyaxsY8969ecoWQ3C46MiLqtY6vlLyG6AGMJhmsRzY E8tYoJVYsvKIaKws91c3Oeq31J5cdV0uovRpJmWG+fWCUB7koKsRuZOycpG3bA3A8XI2 CImg== 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 ci15-20020a17090afc8f00b0026823d86469si7910513pjb.24.2023.07.31.12.40.52; Mon, 31 Jul 2023 12:41:05 -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 S229917AbjGaTLo (ORCPT + 99 others); Mon, 31 Jul 2023 15:11:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229915AbjGaTLn (ORCPT ); Mon, 31 Jul 2023 15:11:43 -0400 Received: from pidgin.makrotopia.org (pidgin.makrotopia.org [185.142.180.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5C2B112F for ; Mon, 31 Jul 2023 12:11:42 -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 1qQYIo-0001gy-1K; Mon, 31 Jul 2023 19:11:35 +0000 Date: Mon, 31 Jul 2023 20:11:23 +0100 From: Daniel Golle To: Richard Weinberger , Miquel Raynal , Vignesh Raghavendra , linux-kernel@vger.kernel.org, linux-mtd@lists.infradead.org Subject: [PATCH 1/6] mtd: ubi: block: don't return on error when removing Message-ID: <49bb3589e98a65cc03e43809ad14066e59ace032.1690823629.git.daniel@makrotopia.org> 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,T_SCC_BODY_TEXT_LINE 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: 1772966343681129689 X-GMAIL-MSGID: 1772966343681129689 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; }