From patchwork Wed Jan 22 09:29:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 233390 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=-5.7 required=3.0 tests=DATE_IN_PAST_03_06, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham 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 E0E79C3F68F for ; Wed, 22 Jan 2020 13:27:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AE59F24688 for ; Wed, 22 Jan 2020 13:27:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699632; bh=l7n7uBEtGZUT61sBmuInYx84GY56GaOOKqb90/z8pD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ok8DNiay7ti5SuaUrQggc++XL4Daks2gj0fFvbSJhjwpn9R6AalKWvH7eVkd8GKvo OljBG/BvqHzf1XsdVDD+1yg3+yquhUuR44fasnNzfQFqhH0Qg4EHJzyT7YBxjp7Q0L sPR5Ymk5+SpqRni3Wkui16obFC8ctoCJctBKlh8I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729370AbgAVN1L (ORCPT ); Wed, 22 Jan 2020 08:27:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:48260 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725870AbgAVN1F (ORCPT ); Wed, 22 Jan 2020 08:27:05 -0500 Received: from localhost (unknown [84.241.205.26]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3C61024688; Wed, 22 Jan 2020 13:27:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579699623; bh=l7n7uBEtGZUT61sBmuInYx84GY56GaOOKqb90/z8pD8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cNmqEXrXxOD5sYbwzffux8CDrk2Y7fLGAMVZvfKbF4mDfkIZXx1jBNaBnHIBTrELz TiAT46dOqqbyyqH8rSiUYp2FuBbV4ySceiiU3wvQs9/HSK1fDsfXf/6fjd7F5usVEc IFZf60jFv5gT8YOsdUtzgnKmXNlETeOm0iFxEYHg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Xiang Chen , John Garry , "Martin K. Petersen" Subject: [PATCH 5.4 200/222] scsi: hisi_sas: Dont create debugfs dump folder twice Date: Wed, 22 Jan 2020 10:29:46 +0100 Message-Id: <20200122092848.027188408@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200122092833.339495161@linuxfoundation.org> References: <20200122092833.339495161@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Xiang Chen commit 35160421b63d4753a72e9f72ebcdd9d6f88f84b9 upstream. Due to a merge error, we attempt to create 2x debugfs dump folders, which fails: [ 861.101914] debugfs: Directory 'dump' with parent '0000:74:02.0' already present! This breaks the dump function. To fix, remove the superfluous attempt to create the folder. Fixes: 7ec7082c57ec ("scsi: hisi_sas: Add hisi_sas_debugfs_alloc() to centralise allocation") Link: https://lore.kernel.org/r/1571926105-74636-2-git-send-email-john.garry@huawei.com Signed-off-by: Xiang Chen Signed-off-by: John Garry Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/hisi_sas/hisi_sas_main.c | 3 --- 1 file changed, 3 deletions(-) --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c @@ -3719,9 +3719,6 @@ static int hisi_sas_debugfs_alloc(struct int p, c, d; size_t sz; - hisi_hba->debugfs_dump_dentry = - debugfs_create_dir("dump", hisi_hba->debugfs_dir); - sz = hw->debugfs_reg_array[DEBUGFS_GLOBAL]->count * 4; hisi_hba->debugfs_regs[DEBUGFS_GLOBAL] = devm_kmalloc(dev, sz, GFP_KERNEL);