From patchwork Tue Aug 1 01:47:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 128946 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2384195vqg; Mon, 31 Jul 2023 19:03:16 -0700 (PDT) X-Google-Smtp-Source: APBJJlH1eMwUrRhDwgXM3puPeey/ZsVHgeRsK2cscCjtBPi9NBE5YhJyFui8yF40wfvrv1PfREQe X-Received: by 2002:a05:6870:c213:b0:1ba:59da:31dc with SMTP id z19-20020a056870c21300b001ba59da31dcmr14339113oae.24.1690855396024; Mon, 31 Jul 2023 19:03:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690855395; cv=none; d=google.com; s=arc-20160816; b=W1UH1Fo0wwMfhF/2ReFGI5kC8EykBGgvYlf+R7QCSLEj0Nbc8KwlJVQxDCubSa/Iya /XnJ+sNQx5ycQTYzMkj6hVB3sd5uDT5ck5+KgjqPj2Pb20H1Qm1OrVoqIdwK/coBbS4W phuarllufKpJzV4csDpVXvn4RI2Tdnw6qR9OxQix5bFHfWevdwsz3D+LSBgO5lG+Ppjx 3ZNOEKm8FjkFodAxFXZZimAIRuhTt7QHcrRbyT7G2U9V7R7pCs74pDdqcL5dBxi3J+gx OV+/N7spNjybVVVvI4pTYigv3LuE+FnSHCllf1g2oA92J9O0RIVHYDMuSuy8V0USI19O x3MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=JjSELvJdx/pGwr4GV1PG6NynYiObRXf14ILMWP32gl0=; fh=utwb+wCbOJc0OXbW7WFWTv0fwijRY7AINodfhC7zuFo=; b=k0D3OB9uwKzqSl7hVnQnLhAefK891yEnRTvm2QuY8SJWBZxbBzejBNThjEKmukzi32 KiMx83hKXEdf8EZjwSRs8JRGcpAKXwIAJQUW1a1ooHohgs+Z6RZ7XhMOJpSE20uC4pZl sZI/sBokBJdn49uXAGi6kWIbJee4AJfIvOYoIanX3nFxF4rdAOhOjYVJqQkiOrwvgDwf M9ob9CHSeYXa9UKFZ3MtP0i2aBb8C91xkywb9HOHp4glRQCIZL5Bd5B7r/lIR7GhV+OE zfkV2l3R1uDSdmoqZsT8PxsnAm7AqPYLJaPj34mQcuUZq43kHs+/WhuLz7eMRH/JI/tl VWFA== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id d71-20020a63364a000000b005600a533c7esi7968781pga.89.2023.07.31.19.03.02; Mon, 31 Jul 2023 19:03:15 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=alibaba.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231951AbjHABrz (ORCPT + 99 others); Mon, 31 Jul 2023 21:47:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229510AbjHABrx (ORCPT ); Mon, 31 Jul 2023 21:47:53 -0400 Received: from out30-119.freemail.mail.aliyun.com (out30-119.freemail.mail.aliyun.com [115.124.30.119]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7A5F6BD; Mon, 31 Jul 2023 18:47:52 -0700 (PDT) X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R131e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=ay29a033018046050;MF=hsiangkao@linux.alibaba.com;NM=1;PH=DS;RN=6;SR=0;TI=SMTPD_---0VoiopYR_1690854460; Received: from e18g06460.et15sqa.tbsite.net(mailfrom:hsiangkao@linux.alibaba.com fp:SMTPD_---0VoiopYR_1690854460) by smtp.aliyun-inc.com; Tue, 01 Aug 2023 09:47:49 +0800 From: Gao Xiang To: linux-erofs@lists.ozlabs.org Cc: LKML , Christian Brauner , Christoph Hellwig , linux-fsdevel@vger.kernel.org, Gao Xiang Subject: [PATCH] erofs: drop unnecessary WARN_ON() in erofs_kill_sb() Date: Tue, 1 Aug 2023 09:47:37 +0800 Message-Id: <20230801014737.28614-1-hsiangkao@linux.alibaba.com> X-Mailer: git-send-email 2.24.4 In-Reply-To: <20230731-flugbereit-wohnlage-78acdf95ab7e@brauner> References: <20230731-flugbereit-wohnlage-78acdf95ab7e@brauner> MIME-Version: 1.0 X-Spam-Status: No, score=-9.9 required=5.0 tests=BAYES_00, ENV_AND_HDR_SPF_MATCH,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY,USER_IN_DEF_SPF_WL 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: 1772990387990897774 X-GMAIL-MSGID: 1772990387990897774 Previously, .kill_sb() will be called only after fill_super fails. It will be changed [1]. Besides, checking for s_magic in erofs_kill_sb() is unnecessary from any point of view. Let's get rid of it now. [1] https://lore.kernel.org/r/20230731-flugbereit-wohnlage-78acdf95ab7e@brauner Signed-off-by: Gao Xiang Acked-by: Christian Brauner Reviewed-by: Christoph Hellwig --- will upstream this commit later this week after it lands -next. fs/erofs/super.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/fs/erofs/super.c b/fs/erofs/super.c index 9d6a3c6158bd..566f68ddfa36 100644 --- a/fs/erofs/super.c +++ b/fs/erofs/super.c @@ -889,8 +889,6 @@ static void erofs_kill_sb(struct super_block *sb) { struct erofs_sb_info *sbi; - WARN_ON(sb->s_magic != EROFS_SUPER_MAGIC); - /* pseudo mount for anon inodes */ if (sb->s_flags & SB_KERNMOUNT) { kill_anon_super(sb);