diff options
| author | Finn Thain <fthain@telegraphics.com.au> | 2018-12-31 16:44:09 +1100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-02-12 20:02:30 +0100 |
| commit | 41c8920c515619cd77e15f7ea3a97f52ae83aec6 (patch) | |
| tree | 2bab9c8da86b3271b4cdfc843302165ad8f052db /drivers/block | |
| parent | f48987c8a42ab27857c31d3755cf27f05095cc20 (diff) | |
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>
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/swim3.c | 6 |
1 files changed, 5 insertions, 1 deletions
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); |