From patchwork Wed Feb 17 21:18:44 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander A Sverdlin X-Patchwork-Id: 1441397 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=07GEWzRp; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-nokia-onmicrosoft-com header.b=bK/RO8f2; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DgrMv5H1Zz9sCD for ; Thu, 18 Feb 2021 08:20:08 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=jKaOeBaI6MJ+JPzEda40Qeo39cCUJDg0ljXUmYvcA98=; b=07GEWzRp0YickJUZb+D3UoDqB9 E2ZOI0f0tM4/76xeDDIIpakq83VnOH7ABxwKZhOKk/cNp3LxIrDYdLHPm7U0gebizCoH4zFuaa/IF O1wHVjS6cXRKndk5dj0m/y0IufPsKXbFENfmMksrcQhGnI5HxdC07lRFKLTcxaXME44IErCW6ppHE OF46/CHX0nygUAvt3v/P0RfZFD7m+l0z6XtGVflJbKVjbqCHWpcrOa74+BFBxznly/4rsjm/qzqbE YWa2ht5lQH4dwMlxeURBKPgWjsMfuihqETsSXGYhoK1hANOWhYY3ocfpKoYEgii26wNs0pOvPmn7u 7odX1bxw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCUDt-000620-GI; Wed, 17 Feb 2021 21:19:01 +0000 Received: from mail-eopbgr120118.outbound.protection.outlook.com ([40.107.12.118] helo=FRA01-PR2-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCUDq-00060b-4Z for linux-mtd@lists.infradead.org; Wed, 17 Feb 2021 21:18:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jRbkLkW/KkIRYYqmFCyLfUCTc+dSmnC0D0ImZNqR5DfE3zkwtmJPA5vSKlIzV55tjmC5oz0sp8I+pclBbhsNAptRWYj0sEnUnp2AkfdygZzRZPGKm34XN1H06dvpLCnSo4M2sW9xpZW26hgMVcBM5638qLk21HsZ7uzFX+vNXrZJZCc4Vahy+2M54b2hQROFDyGtJ8siz4VKMJmg2s/jwip9xusDedforwP71m+v1Ux/P0YT82S5pZxrDieswU6CqDoS/31OT6rm/5hbRDNmuYsQA4U+QzjqtJy7eeZd7nI82g/JrEAeMAg6qAShvFTSRjems5Zu4GtOBqotOHDjlg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LxAfcAgnk1bqo3Q4wvBZu/rd0JUSYgolyLn5d182qIY=; b=LQ9tZFzzjxjrssVESsigo10gXf3uaSZES7eZE92KI6AnbeeVirZ9p7wH7cuL74yo73e417rzvuocoh9lynERdpos9s0QSBDueKNZNVfn1XHLf2QSyU4lgloPtkMEyFd6TMhXuUB9dPdSRS1TFtxUeOyUgZQvEl0/HxhuYPni80ZAKvI2O9OBk5rg7fDFXc4QCK5PvtrXWAzxt1ZhRxtG474ycJ79L7DpMySUwuel45F6yPizrJxuIrzevtZMUdZDgiCYS+PECEifj2YN0WhYt8mTAdKr+Vb7DkDyqmcQ5t+Fc+6CRCf/dH2/G0r5AFQUiARjdoDkhL/LNbx43fNAyA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nokia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nokia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=LxAfcAgnk1bqo3Q4wvBZu/rd0JUSYgolyLn5d182qIY=; b=bK/RO8f2/SihWkn37jlTImoshM9t8v96TcJruDQ8z8GAwrpUyokmmKVysGjAVgHE2O7JXsPm4o1uqDnSvUKfAQ7yyPrlIGlDHqdW/QZ3aQmt2fAKk7jVQVI4J5QYXuEd4hXc5n+1RGjJg25f35gpUchbnYmxE1X6HPVs1CphyM8= Received: from MR2P264CA0112.FRAP264.PROD.OUTLOOK.COM (2603:10a6:500:33::28) by PR1PR07MB4858.eurprd07.prod.outlook.com (2603:10a6:102:a::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.11; Wed, 17 Feb 2021 21:18:53 +0000 Received: from VE1EUR03FT030.eop-EUR03.prod.protection.outlook.com (2603:10a6:500:33:cafe::6d) by MR2P264CA0112.outlook.office365.com (2603:10a6:500:33::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.38 via Frontend Transport; Wed, 17 Feb 2021 21:18:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.17) smtp.mailfrom=nokia.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.17 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.17; helo=fihe3nok0735.emea.nsn-net.net; Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.17) by VE1EUR03FT030.mail.protection.outlook.com (10.152.18.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 17 Feb 2021 21:18:53 +0000 Received: from ulegcparamis.emea.nsn-net.net (ulegcparamis.emea.nsn-net.net [10.151.74.146]) by fihe3nok0735.emea.nsn-net.net (GMO) with ESMTP id 11HLIoTb020561; Wed, 17 Feb 2021 21:18:50 GMT From: Alexander A Sverdlin To: linux-mtd@lists.infradead.org Subject: [PATCH 1/2] mtd: char: Drop mtd_mutex usage from mtdchar_open() Date: Wed, 17 Feb 2021 22:18:44 +0100 Message-Id: <20210217211845.43364-1-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.10.2 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 1ce135b1-b4a7-458a-fcb9-08d8d389a097 X-MS-TrafficTypeDiagnostic: PR1PR07MB4858: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I8lakeWOsAB8tUADgvIquPKUrg3eBXQHnEV6t3yNDJtI+q0KUnEGPjuM8kzn+Z4zplKAkDFEOadteyB0jzYX/mCqqQ1zztQnHdLJ7v4M86rMHIPgTc+6QMSylcrAXUeW1V/so+8vmmYTgAWbxSRsExjswpWBnpks3Db5iqEWA5IjxkTLRQDEHF9ETdDrCdOTrhaJ5mDnT9UZOyDRWxFk8WulkmHYy8B5c1triGQJ4MCUxOOJdAF2cRTtI4b/be0HxWGWAshhmdPqG2Uz4T3EYZCSJmquN2uUk6jxVtWVPY/Dh1Aj3wGDcOQ7UolNP/wpyFkN8BLn/cnP0A4KbivgI2moS8gK2duDQrg/hVj0BxSpQExh8bj0V27EG7XsqNlhhWdhr5hISXrYYxKE5mJt0bc3T295Lu3S0hjuEcVvL5vWZ38ZurLBGXrw2P7x5+V+Jf68cwxU0KZ3ebvq7s9QcsklnqLJ+GFFBQovlFPB+kkJURVHhNMJGAm+v+iUzErh/1KaswovHPCx5OLTK48VGgPJSX8eDWnqG9itF3BDiLBEuX8w+eGxJIek37T2ljBRoUiDjIs2oKJeSl/jmwSRFMHUv1C7eQKVUw7mMRQPcQeSyQbQ7BQSuwNFeV5ySumfftNyEETysNwfOuc8fV53x3kjxeeH0NV5V1p2VLvSc7b+T3CQKuuk8N4qCR5KoUs9 X-Forefront-Antispam-Report: CIP:131.228.2.17; CTRY:FI; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:fihe3nok0735.emea.nsn-net.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(376002)(346002)(396003)(39860400002)(136003)(46966006)(36840700001)(82310400003)(6916009)(8936002)(8676002)(26005)(2616005)(36860700001)(86362001)(336012)(70586007)(81166007)(478600001)(36756003)(54906003)(82740400003)(186003)(1076003)(83380400001)(2906002)(47076005)(4326008)(70206006)(356005)(6666004)(5660300002)(316002)(36900700001); DIR:OUT; SFP:1102; X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2021 21:18:53.0191 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1ce135b1-b4a7-458a-fcb9-08d8d389a097 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.17]; Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT030.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR1PR07MB4858 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210217_161858_397566_01D2362A X-CRM114-Status: GOOD ( 12.78 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [40.107.12.118 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.12.118 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , Alexander Sverdlin , Vignesh Raghavendra , linux-kernel@vger.kernel.org, Miquel Raynal Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Alexander Sverdlin It looks unnecessary in the function, remove it from the function having in mind to remove it completely. Signed-off-by: Alexander Sverdlin --- drivers/mtd/mtdchar.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index 323035d..f31390d 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -58,13 +58,10 @@ static int mtdchar_open(struct inode *inode, struct file *file) if ((file->f_mode & FMODE_WRITE) && (minor & 1)) return -EACCES; - mutex_lock(&mtd_mutex); mtd = get_mtd_device(NULL, devnum); - if (IS_ERR(mtd)) { - ret = PTR_ERR(mtd); - goto out; - } + if (IS_ERR(mtd)) + return PTR_ERR(mtd); if (mtd->type == MTD_ABSENT) { ret = -ENODEV; @@ -84,13 +81,10 @@ static int mtdchar_open(struct inode *inode, struct file *file) } mfi->mtd = mtd; file->private_data = mfi; - mutex_unlock(&mtd_mutex); return 0; out1: put_mtd_device(mtd); -out: - mutex_unlock(&mtd_mutex); return ret; } /* mtdchar_open */ From patchwork Wed Feb 17 21:18:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander A Sverdlin X-Patchwork-Id: 1441398 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=RNDaTh+P; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=nokia.onmicrosoft.com header.i=@nokia.onmicrosoft.com header.a=rsa-sha256 header.s=selector1-nokia-onmicrosoft-com header.b=ETywvuNL; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DgrMx4HyTz9sVJ for ; Thu, 18 Feb 2021 08:20:13 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=UJ9PoumwL0WPIIhrrbNs3NHdiyotfQGDBfJmiX1v98U=; b=RNDaTh+PQMEUe/d3mjOm1Uo7H 2LUQ0ayXzWzN3n+DJQESL20lkRhpG+0RvB9VQZWElIJi8S7c3SIzr3ZZrTG+0fHhPZomCXaVzfqef gLopz8JgtXmolki6mtnfH3wTYUznftqgkCeoYcPV72M4Sn/h8FMKHla6asAduMowU3kOiJFBG1j2Y BiS+SgynwTdDaOu9ytP/g4iGIVpMzbm28jT82biRtAnzYjLv//VJRoIdcFmUjN6ISI84Q3YAWkeN7 Adm365dsG/GvJm2sXUyBOXtPl9/JAf9Ub5ZZIHvOGMFYsElKv42GEkQlrcDZZXb2D8sECR5vF7opm NRj2vMRbA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCUDu-00062D-Gm; Wed, 17 Feb 2021 21:19:02 +0000 Received: from mail-eopbgr130119.outbound.protection.outlook.com ([40.107.13.119] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lCUDq-00060d-6k for linux-mtd@lists.infradead.org; Wed, 17 Feb 2021 21:18:59 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=XVFX0bqHLeqXZ4VsrGnnlXR4Cz9Z2k0f1kI+Dj+4O/vEECv4sqdFN/xRE6U09wqCpXoNPrd4+X4mzDjjpiNHIWXZ3C4rUyd9rRhFLOfzNKQ8Qgg249bvMNV4lt+SORRqkmvwd+58iu+wZfF5NFR02IEZAxuveSlnpYhDvrDo67tYOsnBw2IAA13SGw9ugiNx4l5RLIZj1p+yPhZfXQ+O6xxYnHhKn9S2sbKwWYCSv9JgH/OJyzYdgLuqiavXExRfKqj0StIBeVd2XcaRY4FIns4gW8Q2Xsak3z54LRvwPk1Xb8C9z2ri8CbqqKAOah1LZZuMfLY+kmUC9Mzi7UcT8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NgsHrchjGVk7Ze3KVVMsru3Mt0s7xlwCJsTedi/ISMw=; b=RlEZSNeeXOKjx3vjd7bT4txGFBzDz/8JA/iNaiTfZU1g4Dx/PIb0XrDDnyB5YszLQzdMoM2yxhjFjxJogIcJ3fSW8uos/RHU1eV+uI+jtmfMUpZDE4VwVng+motnQkvFUAdKmz5NRAENw/EBm6jWMxL/pZbdlSO/b6gLdGyr4ZU/yIYrc3b8bUwhbXn396RBTXQOFGhPOLCpKfFzych4RV80UxwMZxosmYmScuJv4knfhjzHgps8sk2vFmGkFkkFZV1Az9r0MmBiOAX+I1IZSRb8LYGCApXEXhkc4SJVRk5+HkfujnJJP8UMkmLKoyB0G5V1Kmx6PnDV4owBLSiR0g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 131.228.2.17) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nokia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nokia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nokia.onmicrosoft.com; s=selector1-nokia-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=NgsHrchjGVk7Ze3KVVMsru3Mt0s7xlwCJsTedi/ISMw=; b=ETywvuNL2grdwpgoUFsCM12P20gvdHqeqlOTlLDG+0R9tOEkDK7ntgmnLO3mKdJHfdNv1Izk6xjZGAwJq7PTrq3t9nuQ5gKga46U3ujzM+y6kjbD0sXmjUzD/hz3b+82h1x7DZyyFaxvcDjRPu4pmx6tFQhrJis5QJ8PSXkIQWw= Received: from AM6P193CA0117.EURP193.PROD.OUTLOOK.COM (2603:10a6:209:85::22) by AS8PR07MB7430.eurprd07.prod.outlook.com (2603:10a6:20b:2a8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.11; Wed, 17 Feb 2021 21:18:53 +0000 Received: from VE1EUR03FT011.eop-EUR03.prod.protection.outlook.com (2603:10a6:209:85:cafe::10) by AM6P193CA0117.outlook.office365.com (2603:10a6:209:85::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 17 Feb 2021 21:18:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 131.228.2.17) smtp.mailfrom=nokia.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=pass action=none header.from=nokia.com; Received-SPF: Pass (protection.outlook.com: domain of nokia.com designates 131.228.2.17 as permitted sender) receiver=protection.outlook.com; client-ip=131.228.2.17; helo=fihe3nok0735.emea.nsn-net.net; Received: from fihe3nok0735.emea.nsn-net.net (131.228.2.17) by VE1EUR03FT011.mail.protection.outlook.com (10.152.18.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3868.27 via Frontend Transport; Wed, 17 Feb 2021 21:18:53 +0000 Received: from ulegcparamis.emea.nsn-net.net (ulegcparamis.emea.nsn-net.net [10.151.74.146]) by fihe3nok0735.emea.nsn-net.net (GMO) with ESMTP id 11HLIoTc020561; Wed, 17 Feb 2021 21:18:51 GMT From: Alexander A Sverdlin To: linux-mtd@lists.infradead.org Subject: [PATCH 2/2] mtd: char: Get rid of Big MTD Lock Date: Wed, 17 Feb 2021 22:18:45 +0100 Message-Id: <20210217211845.43364-2-alexander.sverdlin@nokia.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20210217211845.43364-1-alexander.sverdlin@nokia.com> References: <20210217211845.43364-1-alexander.sverdlin@nokia.com> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-MS-PublicTrafficType: Email MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 2e665b0a-8223-4e2d-1ad2-08d8d389a0b3 X-MS-TrafficTypeDiagnostic: AS8PR07MB7430: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:302; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qa6SS+BSeQborYbTxH+Q5VY1KX8p9n4LelfoQ5zGZdTtoKcn1BEVFLnWX/8QA/xH8VVHwM0VNSiNdOn3pEt5YJEqUFtPC6qac5AlgiI6D+p9N0sCOrM4L9Z9stlqO8Vy71TdKi5OACOQ2lLE3l2LfqQCsx3b7AXa1/pUDlbHq6K9C6sViShBJDnUp7vpfhw80lAIs67vAzMOVZMJ4mXCwRIu92IvUyyTj3QlwZ/Z0W0bSuGx0hPBXoXLLN0i6242/GWYD6RyqBMPKbOc3CAhuV6hcHEaEJeB50xff1rwrpw/kG2rU0zvUpFi6e1A6/2/9AxFlXrJ0nPTbR6vJ+U5TjOnCIikACom8s64NxscZ3d2yG+NUOUvSVOzjRiTuR9SOvF6HKBRnjNr/lLZ51YzFtCv/LaWHw5BIcNRH1r5s4/pnmj5IyXLNsPrXGyhYJTb9xsF9ZCfgbl9Viw/Zx6svFwIJTyutUNXG9pA8A0wYfcYUFipvqNdWqpDwEaptCtoHjDWfRlqbaL1oyjzGbw502/gtUlUq+SgBSxOPchPp5uvBYve1GC1/2sOAaVbRpT7TAmaG4BMfD0C5LW0B0tabQMbbMoKErRLE2hVG70BvXCpCN6vLUS8hlJCR4a5JOS5ysuNeleO3pp3xKdiiAXzECqQipKtzEdoMpJxHmTpiyEYFAviC4vH25OWV7BT70tbHH7+GRZCwMUjACVEF6UmDQ== X-Forefront-Antispam-Report: CIP:131.228.2.17; CTRY:FI; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:fihe3nok0735.emea.nsn-net.net; PTR:InfoDomainNonexistent; CAT:NONE; SFS:(4636009)(376002)(39860400002)(136003)(396003)(346002)(36840700001)(46966006)(4326008)(83380400001)(1076003)(36860700001)(86362001)(2616005)(47076005)(54906003)(356005)(81166007)(82310400003)(82740400003)(186003)(70586007)(26005)(5660300002)(8676002)(316002)(70206006)(6666004)(478600001)(8936002)(336012)(6916009)(2906002)(36756003)(26583001)(36900700001); DIR:OUT; SFP:1102; X-OriginatorOrg: nokia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2021 21:18:53.1978 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2e665b0a-8223-4e2d-1ad2-08d8d389a0b3 X-MS-Exchange-CrossTenant-Id: 5d471751-9675-428d-917b-70f44f9630b0 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5d471751-9675-428d-917b-70f44f9630b0; Ip=[131.228.2.17]; Helo=[fihe3nok0735.emea.nsn-net.net] X-MS-Exchange-CrossTenant-AuthSource: VE1EUR03FT011.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR07MB7430 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210217_161858_378809_885CB64D X-CRM114-Status: GOOD ( 14.33 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.13.119 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.13.119 listed in wl.mailspike.net] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_HIGH DKIMwl.org - High trust sender X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Richard Weinberger , Alexander Sverdlin , Vignesh Raghavendra , linux-kernel@vger.kernel.org, Miquel Raynal Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Alexander Sverdlin Get rid of central chrdev MTD lock, which prevents simultaneous operations on completely independent physical MTD chips. Replace it with newly introduced per-master mutex. Signed-off-by: Alexander Sverdlin --- drivers/mtd/mtdchar.c | 14 ++++++++------ drivers/mtd/mtdcore.c | 1 + include/linux/mtd/mtd.h | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c index f31390d..57c4a2f 100644 --- a/drivers/mtd/mtdchar.c +++ b/drivers/mtd/mtdchar.c @@ -27,8 +27,6 @@ #include "mtdcore.h" -static DEFINE_MUTEX(mtd_mutex); - /* * Data structure to hold the pointer to the mtd device as well * as mode information of various use cases. @@ -1020,11 +1018,14 @@ static int mtdchar_ioctl(struct file *file, u_int cmd, u_long arg) static long mtdchar_unlocked_ioctl(struct file *file, u_int cmd, u_long arg) { + struct mtd_file_info *mfi = file->private_data; + struct mtd_info *mtd = mfi->mtd; + struct mtd_info *master = mtd_get_master(mtd); int ret; - mutex_lock(&mtd_mutex); + mutex_lock(&master->master.chrdev_lock); ret = mtdchar_ioctl(file, cmd, arg); - mutex_unlock(&mtd_mutex); + mutex_unlock(&master->master.chrdev_lock); return ret; } @@ -1045,10 +1046,11 @@ static long mtdchar_compat_ioctl(struct file *file, unsigned int cmd, { struct mtd_file_info *mfi = file->private_data; struct mtd_info *mtd = mfi->mtd; + struct mtd_info *master = mtd_get_master(mtd); void __user *argp = compat_ptr(arg); int ret = 0; - mutex_lock(&mtd_mutex); + mutex_lock(&master->master.chrdev_lock); switch (cmd) { case MEMWRITEOOB32: @@ -1111,7 +1113,7 @@ static long mtdchar_compat_ioctl(struct file *file, unsigned int cmd, ret = mtdchar_ioctl(file, cmd, (unsigned long)argp); } - mutex_unlock(&mtd_mutex); + mutex_unlock(&master->master.chrdev_lock); return ret; } diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 2d6423d..0b09597 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c @@ -773,6 +773,7 @@ static void mtd_set_dev_defaults(struct mtd_info *mtd) INIT_LIST_HEAD(&mtd->partitions); mutex_init(&mtd->master.partitions_lock); + mutex_init(&mtd->master.chrdev_lock); } /** diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 157357e..ceabc2c 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -229,6 +229,7 @@ struct mtd_part { */ struct mtd_master { struct mutex partitions_lock; + struct mutex chrdev_lock; unsigned int suspended : 1; };