From: Denis Efremov <efremov@linux.com>
To: linux-block@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, regressions@lists.linux.dev,
Denis Efremov <efremov@linux.com>,
Mark Hounschell <markh@compro.net>, Jiri Kosina <jkosina@suse.cz>,
Wim Osterholt <wim@djo.tudelft.nl>,
Kurt Garloff <kurt@garloff.de>,
stable@vger.kernel.org
Subject: [PATCH] Revert "floppy: reintroduce O_NDELAY fix"
Date: Sun, 8 Aug 2021 10:42:46 +0300 [thread overview]
Message-ID: <20210808074246.33449-1-efremov@linux.com> (raw)
In-Reply-To: <de10cb47-34d1-5a88-7751-225ca380f735@compro.net>
The patch breaks userspace implementations (e.g. fdutils) and introduces
regressions in behaviour. Previously, it was possible to O_NDELAY open a
floppy device with no media inserted or with write protected media without
an error. Some userspace tools use this particular behavior for probing.
It's not the first time when we revert this patch. Previous revert is in
commit f2791e7eadf4 (Revert "floppy: refactor open() flags handling").
This reverts commit 8a0c014cd20516ade9654fc13b51345ec58e7be8.
Link: https://lore.kernel.org/linux-block/de10cb47-34d1-5a88-7751-225ca380f735@compro.net/
Reported-by: Mark Hounschell <markh@compro.net>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Wim Osterholt <wim@djo.tudelft.nl>
Cc: Kurt Garloff <kurt@garloff.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Denis Efremov <efremov@linux.com>
---
drivers/block/floppy.c | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 87460e0e5c72..fef79ea52e3e 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -4029,23 +4029,23 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
if (fdc_state[FDC(drive)].rawcmd == 1)
fdc_state[FDC(drive)].rawcmd = 2;
- if (mode & (FMODE_READ|FMODE_WRITE)) {
- drive_state[drive].last_checked = 0;
- clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &drive_state[drive].flags);
- if (bdev_check_media_change(bdev))
- floppy_revalidate(bdev->bd_disk);
- if (test_bit(FD_DISK_CHANGED_BIT, &drive_state[drive].flags))
- goto out;
- if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &drive_state[drive].flags))
+ if (!(mode & FMODE_NDELAY)) {
+ if (mode & (FMODE_READ|FMODE_WRITE)) {
+ drive_state[drive].last_checked = 0;
+ clear_bit(FD_OPEN_SHOULD_FAIL_BIT,
+ &drive_state[drive].flags);
+ if (bdev_check_media_change(bdev))
+ floppy_revalidate(bdev->bd_disk);
+ if (test_bit(FD_DISK_CHANGED_BIT, &drive_state[drive].flags))
+ goto out;
+ if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &drive_state[drive].flags))
+ goto out;
+ }
+ res = -EROFS;
+ if ((mode & FMODE_WRITE) &&
+ !test_bit(FD_DISK_WRITABLE_BIT, &drive_state[drive].flags))
goto out;
}
-
- res = -EROFS;
-
- if ((mode & FMODE_WRITE) &&
- !test_bit(FD_DISK_WRITABLE_BIT, &drive_state[drive].flags))
- goto out;
-
mutex_unlock(&open_lock);
mutex_unlock(&floppy_mutex);
return 0;
--
2.31.1
next prev parent reply other threads:[~2021-08-08 7:43 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-23 18:47 [BUG] FLOPPY DRIVER since 5.10.20 Mark Hounschell
2021-07-26 7:57 ` Denis Efremov
2021-07-26 11:15 ` Mark Hounschell
2021-07-26 11:17 ` Mark Hounschell
2021-07-26 11:37 ` Denis Efremov
2021-07-26 12:23 ` Mark Hounschell
2021-07-26 16:34 ` Denis Efremov
2021-07-30 5:15 ` Denis Efremov
2021-08-01 11:14 ` Kurt Garloff
2021-08-08 7:42 ` Denis Efremov [this message]
2021-08-16 7:17 ` [PATCH] Revert "floppy: reintroduce O_NDELAY fix" Jiri Kosina
2021-08-18 15:53 ` Denis Efremov
2021-08-30 9:20 ` Thorsten Leemhuis
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=20210808074246.33449-1-efremov@linux.com \
--to=efremov@linux.com \
--cc=jkosina@suse.cz \
--cc=kurt@garloff.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markh@compro.net \
--cc=regressions@lists.linux.dev \
--cc=stable@vger.kernel.org \
--cc=wim@djo.tudelft.nl \
--subject='Re: [PATCH] Revert "floppy: reintroduce O_NDELAY fix"' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).