Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Arch Linux
Packaging
Upstream
linux-rt
Commits
f2791e7e
Commit
f2791e7e
authored
Aug 25, 2016
by
Jens Axboe
Browse files
Revert "floppy: refactor open() flags handling"
This reverts commit
09954bad
.
parent
468c298a
Changes
1
Hide whitespace changes
Inline
Side-by-side
drivers/block/floppy.c
View file @
f2791e7e
...
...
@@ -3663,11 +3663,6 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
opened_bdev
[
drive
]
=
bdev
;
if
(
!
(
mode
&
(
FMODE_READ
|
FMODE_WRITE
)))
{
res
=
-
EINVAL
;
goto
out
;
}
res
=
-
ENXIO
;
if
(
!
floppy_track_buffer
)
{
...
...
@@ -3711,20 +3706,21 @@ static int floppy_open(struct block_device *bdev, fmode_t mode)
if
(
UFDCS
->
rawcmd
==
1
)
UFDCS
->
rawcmd
=
2
;
UDRS
->
last_checked
=
0
;
clear_bit
(
FD_OPEN_SHOULD_FAIL_BIT
,
&
UDRS
->
flags
);
check_disk_change
(
bdev
);
if
(
test_bit
(
FD_DISK_CHANGED_BIT
,
&
UDRS
->
flags
))
goto
out
;
if
(
test_bit
(
FD_OPEN_SHOULD_FAIL_BIT
,
&
UDRS
->
flags
))
goto
out
;
res
=
-
EROFS
;
if
((
mode
&
FMODE_WRITE
)
&&
!
test_bit
(
FD_DISK_WRITABLE_BIT
,
&
UDRS
->
flags
))
goto
out
;
if
(
!
(
mode
&
FMODE_NDELAY
))
{
if
(
mode
&
(
FMODE_READ
|
FMODE_WRITE
))
{
UDRS
->
last_checked
=
0
;
clear_bit
(
FD_OPEN_SHOULD_FAIL_BIT
,
&
UDRS
->
flags
);
check_disk_change
(
bdev
);
if
(
test_bit
(
FD_DISK_CHANGED_BIT
,
&
UDRS
->
flags
))
goto
out
;
if
(
test_bit
(
FD_OPEN_SHOULD_FAIL_BIT
,
&
UDRS
->
flags
))
goto
out
;
}
res
=
-
EROFS
;
if
((
mode
&
FMODE_WRITE
)
&&
!
test_bit
(
FD_DISK_WRITABLE_BIT
,
&
UDRS
->
flags
))
goto
out
;
}
mutex_unlock
(
&
open_lock
);
mutex_unlock
(
&
floppy_mutex
);
return
0
;
...
...
David Runge
🐿
@dvzrv
mentioned in commit
ebf67b94
·
Sep 07, 2021
mentioned in commit
ebf67b94
mentioned in commit ebf67b94ca7a6a17f73812433b8ccd6e76754d26
Toggle commit list
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment