From: Greg Kroah-Hartman <gregkh@linuxfoundation•org>
To: linux-kernel@vger•kernel.org
Cc: Jens Axboe <axboe@kernel•dk>, Sasha Levin <sashal@kernel•org>,
Stan Johnson <userm57@yahoo•com>,
Greg Kroah-Hartman <gregkh@linuxfoundation•org>,
Finn Thain <fthain@telegraphics•com.au>,
stable@vger•kernel.org, linuxppc-dev@lists•ozlabs.org
Subject: [PATCH 4.20 273/352] block/swim3: Fix -EBUSY error when re-opening device after unmount
Date: Mon, 11 Feb 2019 15:18:20 +0100 [thread overview]
Message-ID: <20190211141904.347218860@linuxfoundation.org> (raw)
In-Reply-To: <20190211141846.543045703@linuxfoundation.org>
4.20-stable review patch. If anyone has any objections, please let me know.
------------------
[ 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 <userm57@yahoo•com>
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc: linuxppc-dev@lists•ozlabs.org
Signed-off-by: Finn Thain <fthain@telegraphics•com.au>
Signed-off-by: Jens Axboe <axboe@kernel•dk>
Signed-off-by: Sasha Levin <sashal@kernel•org>
---
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 c1c676a33e4a..3f6df3f1f5d9 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -995,7 +995,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
next parent reply other threads:[~2019-02-11 14:37 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190211141846.543045703@linuxfoundation.org>
2019-02-11 14:18 ` Greg Kroah-Hartman [this message]
2019-02-11 14:18 ` [PATCH 4.20 278/352] block/swim3: Fix regression on PowerBook G3 Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190211141904.347218860@linuxfoundation.org \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=axboe@kernel$(echo .)dk \
--cc=fthain@telegraphics$(echo .)com.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linuxppc-dev@lists$(echo .)ozlabs.org \
--cc=sashal@kernel$(echo .)org \
--cc=stable@vger$(echo .)kernel.org \
--cc=userm57@yahoo$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox