Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linux-davinci
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
linux
linux-davinci
Commits
23a39eed
Commit
23a39eed
authored
Apr 30, 2009
by
Bartlomiej Zolnierkiewicz
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'for-linus' into for-next
parents
b656eba1
96c16743
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
drivers/ide/ide-cd.c
drivers/ide/ide-cd.c
+4
-5
include/linux/blkdev.h
include/linux/blkdev.h
+1
-0
No files found.
drivers/ide/ide-cd.c
View file @
23a39eed
...
...
@@ -283,7 +283,6 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
ide_hwif_t
*
hwif
=
drive
->
hwif
;
struct
request
*
rq
=
hwif
->
rq
;
int
err
,
sense_key
,
do_end_request
=
0
;
u8
quiet
=
rq
->
cmd_flags
&
REQ_QUIET
;
/* get the IDE error register */
err
=
ide_read_error
(
drive
);
...
...
@@ -318,7 +317,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
}
else
{
cdrom_saw_media_change
(
drive
);
if
(
blk_fs_request
(
rq
)
&&
!
quiet
)
if
(
blk_fs_request
(
rq
)
&&
!
blk_rq_quiet
(
rq
)
)
printk
(
KERN_ERR
PFX
"%s: tray open
\n
"
,
drive
->
name
);
}
...
...
@@ -353,7 +352,7 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
* No point in retrying after an illegal request or data
* protect error.
*/
if
(
!
quiet
)
if
(
!
blk_rq_quiet
(
rq
)
)
ide_dump_status
(
drive
,
"command error"
,
stat
);
do_end_request
=
1
;
break
;
...
...
@@ -362,14 +361,14 @@ static int cdrom_decode_status(ide_drive_t *drive, u8 stat)
* No point in re-trying a zillion times on a bad sector.
* If we got here the error is not correctable.
*/
if
(
!
quiet
)
if
(
!
blk_rq_quiet
(
rq
)
)
ide_dump_status
(
drive
,
"media error "
"(bad sector)"
,
stat
);
do_end_request
=
1
;
break
;
case
BLANK_CHECK
:
/* disk appears blank? */
if
(
!
quiet
)
if
(
!
blk_rq_quiet
(
rq
)
)
ide_dump_status
(
drive
,
"media error (blank)"
,
stat
);
do_end_request
=
1
;
...
...
include/linux/blkdev.h
View file @
23a39eed
...
...
@@ -598,6 +598,7 @@ enum {
blk_failfast_transport(rq) || \
blk_failfast_driver(rq))
#define blk_rq_started(rq) ((rq)->cmd_flags & REQ_STARTED)
#define blk_rq_quiet(rq) ((rq)->cmd_flags & REQ_QUIET)
#define blk_account_rq(rq) (blk_rq_started(rq) && (blk_fs_request(rq) || blk_discard_rq(rq)))
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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