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.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 BC48EC282C8 for ; Mon, 28 Jan 2019 16:28:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 849982171F for ; Mon, 28 Jan 2019 16:28:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692893; bh=oYPjhPoJOdKPcquVveULBy27n9+m1cqrhyL4DOJ9Z3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AjJ1Kww2J5UQT266wJSjHVBrDB/4SlD0sjt8lEV0GK3lIlGIPaslI4+RyRyh5pcTs c/Ht9fWbIenpRfK+xV0PZ5yhNRpkdnOMz+eQj7Q7kMYOm7QWnI+kGZgT9xdTTh3zsd 9SfynMy5ya9jMVdwWB1jrGwILpuVGQIz/HIrLBVI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390604AbfA1Q2M (ORCPT ); Mon, 28 Jan 2019 11:28:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:38684 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733074AbfA1Q2J (ORCPT ); Mon, 28 Jan 2019 11:28:09 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7168C2177E; Mon, 28 Jan 2019 16:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692888; bh=oYPjhPoJOdKPcquVveULBy27n9+m1cqrhyL4DOJ9Z3o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zISpRvbO3CcbRUcTLmtdRnjBfl4FvryP1UxnkJJsg5HgG5mooKD6wos0kOXobNYO1 5Eg/J8QTURtXhVm58bogCpfCHNHkXkJE4db055pB6UuPRNPto4uspEAhTDEeZQSZfF EunTlfGMOESbQwndI+2zrW/V3ifasYIa4o2HF7dE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Finn Thain , linuxppc-dev@lists.ozlabs.org, Jens Axboe , Sasha Levin , linux-block@vger.kernel.org Subject: [PATCH AUTOSEL 3.18 58/61] block/swim3: Fix -EBUSY error when re-opening device after unmount Date: Mon, 28 Jan 2019 11:26:20 -0500 Message-Id: <20190128162623.59854-58-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128162623.59854-1-sashal@kernel.org> References: <20190128162623.59854-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Finn Thain [ Upstream commit 296dcc40f2f2e402facf7cd26cf3f2c8f4b17d47 ] When the block device is opened with FMODE_EXCL, ref_count is set to -1. This value doesn't get reset when the device is closed which means the device cannot be opened again. Fix this by checking for refcount <= 0 in the release method. Reported-and-tested-by: Stan Johnson Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Finn Thain Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/swim3.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 523ee8fd4c15..eaf1336623aa 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -1027,7 +1027,11 @@ static void floppy_release(struct gendisk *disk, fmode_t mode) struct swim3 __iomem *sw = fs->swim3; mutex_lock(&swim3_mutex); - if (fs->ref_count > 0 && --fs->ref_count == 0) { + if (fs->ref_count > 0) + --fs->ref_count; + else if (fs->ref_count == -1) + fs->ref_count = 0; + if (fs->ref_count == 0) { swim3_action(fs, MOTOR_OFF); out_8(&sw->control_bic, 0xff); swim3_select(fs, RELAX); -- 2.19.1