Commit 468c298a authored by Jens Axboe's avatar Jens Axboe

Revert "floppy: fix open(O_ACCMODE) for ioctl-only open"

This reverts commit ff06db1e.
parent 5bb53c0f
...@@ -3663,6 +3663,11 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) ...@@ -3663,6 +3663,11 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
opened_bdev[drive] = bdev; opened_bdev[drive] = bdev;
if (!(mode & (FMODE_READ|FMODE_WRITE))) {
res = -EINVAL;
goto out;
}
res = -ENXIO; res = -ENXIO;
if (!floppy_track_buffer) { if (!floppy_track_buffer) {
...@@ -3706,15 +3711,13 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) ...@@ -3706,15 +3711,13 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
if (UFDCS->rawcmd == 1) if (UFDCS->rawcmd == 1)
UFDCS->rawcmd = 2; UFDCS->rawcmd = 2;
if (mode & (FMODE_READ|FMODE_WRITE)) { UDRS->last_checked = 0;
UDRS->last_checked = 0; clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags); check_disk_change(bdev);
check_disk_change(bdev); if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags))
if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags)) goto out;
goto out; if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))
if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags)) goto out;
goto out;
}
res = -EROFS; res = -EROFS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment