Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
2af01b24
Commit
2af01b24
authored
Dec 17, 2003
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge nuts.ninka.net:/disk1/davem/BK/sparcwork-2.5
into nuts.ninka.net:/disk1/davem/BK/sparc-2.5
parents
cbdac834
67e9bb60
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
35 additions
and
12 deletions
+35
-12
Makefile
Makefile
+1
-1
drivers/block/scsi_ioctl.c
drivers/block/scsi_ioctl.c
+15
-8
drivers/ide/ide-cd.c
drivers/ide/ide-cd.c
+4
-0
drivers/ide/ide-cd.h
drivers/ide/ide-cd.h
+2
-1
drivers/scsi/qla1280.c
drivers/scsi/qla1280.c
+13
-2
No files found.
Makefile
View file @
2af01b24
VERSION
=
2
VERSION
=
2
PATCHLEVEL
=
6
PATCHLEVEL
=
6
SUBLEVEL
=
0
SUBLEVEL
=
0
EXTRAVERSION
=
-test11
EXTRAVERSION
=
# *DOCUMENTATION*
# *DOCUMENTATION*
# To see a list of typical targets execute "make help"
# To see a list of typical targets execute "make help"
...
...
drivers/block/scsi_ioctl.c
View file @
2af01b24
...
@@ -150,7 +150,6 @@ static int sg_io(request_queue_t *q, struct block_device *bdev,
...
@@ -150,7 +150,6 @@ static int sg_io(request_queue_t *q, struct block_device *bdev,
struct
request
*
rq
;
struct
request
*
rq
;
struct
bio
*
bio
;
struct
bio
*
bio
;
char
sense
[
SCSI_SENSE_BUFFERSIZE
];
char
sense
[
SCSI_SENSE_BUFFERSIZE
];
unsigned
char
cdb
[
BLK_MAX_CDB
];
void
*
buffer
;
void
*
buffer
;
if
(
hdr
->
interface_id
!=
'S'
)
if
(
hdr
->
interface_id
!=
'S'
)
...
@@ -167,9 +166,6 @@ static int sg_io(request_queue_t *q, struct block_device *bdev,
...
@@ -167,9 +166,6 @@ static int sg_io(request_queue_t *q, struct block_device *bdev,
if
(
hdr
->
dxfer_len
>
(
q
->
max_sectors
<<
9
))
if
(
hdr
->
dxfer_len
>
(
q
->
max_sectors
<<
9
))
return
-
EIO
;
return
-
EIO
;
if
(
copy_from_user
(
cdb
,
hdr
->
cmdp
,
hdr
->
cmd_len
))
return
-
EFAULT
;
reading
=
writing
=
0
;
reading
=
writing
=
0
;
buffer
=
NULL
;
buffer
=
NULL
;
bio
=
NULL
;
bio
=
NULL
;
...
@@ -220,7 +216,7 @@ static int sg_io(request_queue_t *q, struct block_device *bdev,
...
@@ -220,7 +216,7 @@ static int sg_io(request_queue_t *q, struct block_device *bdev,
* fill in request structure
* fill in request structure
*/
*/
rq
->
cmd_len
=
hdr
->
cmd_len
;
rq
->
cmd_len
=
hdr
->
cmd_len
;
memcpy
(
rq
->
cmd
,
cdb
,
hdr
->
cmd_len
);
memcpy
(
rq
->
cmd
,
hdr
->
cmdp
,
hdr
->
cmd_len
);
if
(
sizeof
(
rq
->
cmd
)
!=
hdr
->
cmd_len
)
if
(
sizeof
(
rq
->
cmd
)
!=
hdr
->
cmd_len
)
memset
(
rq
->
cmd
+
hdr
->
cmd_len
,
0
,
sizeof
(
rq
->
cmd
)
-
hdr
->
cmd_len
);
memset
(
rq
->
cmd
+
hdr
->
cmd_len
,
0
,
sizeof
(
rq
->
cmd
)
-
hdr
->
cmd_len
);
...
@@ -436,12 +432,23 @@ int scsi_cmd_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long ar
...
@@ -436,12 +432,23 @@ int scsi_cmd_ioctl(struct block_device *bdev, unsigned int cmd, unsigned long ar
break
;
break
;
case
SG_IO
:
{
case
SG_IO
:
{
struct
sg_io_hdr
hdr
;
struct
sg_io_hdr
hdr
;
unsigned
char
cdb
[
BLK_MAX_CDB
],
*
old_cdb
;
if
(
copy_from_user
(
&
hdr
,
(
struct
sg_io_hdr
*
)
arg
,
sizeof
(
hdr
)))
{
err
=
-
EFAULT
;
err
=
-
EFAULT
;
if
(
copy_from_user
(
&
hdr
,
(
struct
sg_io_hdr
*
)
arg
,
sizeof
(
hdr
)))
break
;
break
;
}
err
=
-
EINVAL
;
if
(
hdr
.
cmd_len
>
sizeof
(
rq
->
cmd
))
break
;
err
=
-
EFAULT
;
if
(
copy_from_user
(
cdb
,
hdr
.
cmdp
,
hdr
.
cmd_len
))
break
;
old_cdb
=
hdr
.
cmdp
;
hdr
.
cmdp
=
cdb
;
err
=
sg_io
(
q
,
bdev
,
&
hdr
);
err
=
sg_io
(
q
,
bdev
,
&
hdr
);
hdr
.
cmdp
=
old_cdb
;
if
(
copy_to_user
((
struct
sg_io_hdr
*
)
arg
,
&
hdr
,
sizeof
(
hdr
)))
if
(
copy_to_user
((
struct
sg_io_hdr
*
)
arg
,
&
hdr
,
sizeof
(
hdr
)))
err
=
-
EFAULT
;
err
=
-
EFAULT
;
break
;
break
;
...
...
drivers/ide/ide-cd.c
View file @
2af01b24
...
@@ -799,6 +799,10 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
...
@@ -799,6 +799,10 @@ static int cdrom_decode_status(ide_drive_t *drive, int good_stat, int *stat_ret)
* sector... If we got here the error is not correctable */
* sector... If we got here the error is not correctable */
ide_dump_status
(
drive
,
"media error (bad sector)"
,
stat
);
ide_dump_status
(
drive
,
"media error (bad sector)"
,
stat
);
do_end_request
=
1
;
do_end_request
=
1
;
}
else
if
(
sense_key
==
BLANK_CHECK
)
{
/* Disk appears blank ?? */
ide_dump_status
(
drive
,
"media error (blank)"
,
stat
);
do_end_request
=
1
;
}
else
if
((
err
&
~
ABRT_ERR
)
!=
0
)
{
}
else
if
((
err
&
~
ABRT_ERR
)
!=
0
)
{
/* Go to the default handler
/* Go to the default handler
for other errors. */
for other errors. */
...
...
drivers/ide/ide-cd.h
View file @
2af01b24
...
@@ -501,6 +501,7 @@ struct cdrom_info {
...
@@ -501,6 +501,7 @@ struct cdrom_info {
#define ILLEGAL_REQUEST 0x05
#define ILLEGAL_REQUEST 0x05
#define UNIT_ATTENTION 0x06
#define UNIT_ATTENTION 0x06
#define DATA_PROTECT 0x07
#define DATA_PROTECT 0x07
#define BLANK_CHECK 0x08
#define ABORTED_COMMAND 0x0b
#define ABORTED_COMMAND 0x0b
#define MISCOMPARE 0x0e
#define MISCOMPARE 0x0e
...
@@ -578,7 +579,7 @@ const char * const sense_key_texts[16] = {
...
@@ -578,7 +579,7 @@ const char * const sense_key_texts[16] = {
"Illegal request"
,
"Illegal request"
,
"Unit attention"
,
"Unit attention"
,
"Data protect"
,
"Data protect"
,
"
(reserved)
"
,
"
Blank check
"
,
"(reserved)"
,
"(reserved)"
,
"(reserved)"
,
"(reserved)"
,
"Aborted command"
,
"Aborted command"
,
...
...
drivers/scsi/qla1280.c
View file @
2af01b24
...
@@ -16,9 +16,13 @@
...
@@ -16,9 +16,13 @@
* General Public License for more details.
* General Public License for more details.
*
*
******************************************************************************/
******************************************************************************/
#define QLA1280_VERSION "3.23.37"
#define QLA1280_VERSION "3.23.37
.1
"
/*****************************************************************************
/*****************************************************************************
Revision History:
Revision History:
Rev 3.23.37.1 December 17, 2003, Jes Sorensen
- Delete completion queue from srb if mailbox command failed to
to avoid qla1280_done completeting qla1280_error_action's
obsolete context
Rev 3.23.37 October 1, 2003, Jes Sorensen
Rev 3.23.37 October 1, 2003, Jes Sorensen
- Make MMIO depend on CONFIG_X86_VISWS instead of yet another
- Make MMIO depend on CONFIG_X86_VISWS instead of yet another
random CONFIG option
random CONFIG option
...
@@ -1464,8 +1468,15 @@ qla1280_error_action(Scsi_Cmnd * cmd, enum action action)
...
@@ -1464,8 +1468,15 @@ qla1280_error_action(Scsi_Cmnd * cmd, enum action action)
/* If we didn't manage to issue the action, or we have no
/* If we didn't manage to issue the action, or we have no
* command to wait for, exit here */
* command to wait for, exit here */
if
(
result
==
FAILED
||
handle
==
NULL
||
if
(
result
==
FAILED
||
handle
==
NULL
||
handle
==
(
unsigned
char
*
)
INVALID_HANDLE
)
handle
==
(
unsigned
char
*
)
INVALID_HANDLE
)
{
/*
* Clear completion queue to avoid qla1280_done() trying
* to complete the command at a later stage after we
* have exited the current context
*/
sp
->
wait
=
NULL
;
goto
leave
;
goto
leave
;
}
/* set up a timer just in case we're really jammed */
/* set up a timer just in case we're really jammed */
init_timer
(
&
timer
);
init_timer
(
&
timer
);
...
...
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