From mboxrd@z Thu Jan 1 00:00:00 1970 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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 32669C432C0 for ; Tue, 3 Dec 2019 22:48:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED13920656 for ; Tue, 3 Dec 2019 22:48:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413330; bh=Hmg79Sxclns4GLLVqoAaN6QyA0n32dwOc0zGRsOnumU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=YLTK3gvDwOMf4JV1lqHiZpophCj+j+5C8U4VNkMRiIBpITMc4UFQVUZYlh3hhVYQA TudIAbEtPKNdMCMxshtHecpuh9Ai5SczIoSLrIQDliJ3yzb+3wpP10Edr+zbBu85/l iYeJ07XRCIilB41KrKBQyywO8R6hB68c+VGz3HnU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729493AbfLCWss (ORCPT ); Tue, 3 Dec 2019 17:48:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:39536 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728713AbfLCWsq (ORCPT ); Tue, 3 Dec 2019 17:48:46 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 39DA920803; Tue, 3 Dec 2019 22:48:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413325; bh=Hmg79Sxclns4GLLVqoAaN6QyA0n32dwOc0zGRsOnumU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZN5m82sVHyLMSRy64u1qST7FKiTwIWwh7GqhhRjO3fVtNKdwTTzWgLdMBTLTCbYRl nz6TDeFFMQgDjERSaSOCp2aaGkUBi921GVRuUqLG0NGAPfaV/UUeU569fzS5g7slBh DIL743iFZSDbv9yHB12E4ErS/gaXL97M7HNgkU0c= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Jens Axboe , Sasha Levin Subject: [PATCH 4.19 045/321] block: drbd: remove a stray unlock in __drbd_send_protocol() Date: Tue, 3 Dec 2019 23:31:51 +0100 Message-Id: <20191203223429.452654392@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dan Carpenter [ Upstream commit 8e9c523016cf9983b295e4bc659183d1fa6ef8e0 ] There are two callers of this function and they both unlock the mutex so this ends up being a double unlock. Fixes: 44ed167da748 ("drbd: rcu_read_lock() and rcu_dereference() for tconn->net_conf") Signed-off-by: Dan Carpenter Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/drbd/drbd_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index ef8212a4b73ef..a49a8d91a5990 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -796,7 +796,6 @@ int __drbd_send_protocol(struct drbd_connection *connection, enum drbd_packet cm if (nc->tentative && connection->agreed_pro_version < 92) { rcu_read_unlock(); - mutex_unlock(&sock->mutex); drbd_err(connection, "--dry-run is not supported by peer"); return -EOPNOTSUPP; } -- 2.20.1