summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2018-12-31 16:44:09 +1100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-02-12 19:46:09 +0100
commitd541fb2af57d22220e8823a5307cf4cb06a25f2d (patch)
tree30f00259649b715687d7bb1b32d763162f1af602
parent922c8a5ef7ad6863e7235634c44c94f657fbdebc (diff)
downloadlinux-exynos-d541fb2af57d22220e8823a5307cf4cb06a25f2d.tar.gz
linux-exynos-d541fb2af57d22220e8823a5307cf4cb06a25f2d.tar.bz2
linux-exynos-d541fb2af57d22220e8823a5307cf4cb06a25f2d.zip
block/swim3: Fix -EBUSY error when re-opening device after unmount
[ 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>
-rw-r--r--drivers/block/swim3.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 0d7527c6825a..2f7acdb830c3 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);