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
f9e06c69
Commit
f9e06c69
authored
Jul 30, 2014
by
James Bottomley
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'scsi-queue/core-for-3.17' into for-next
parents
cbf67842
0213436a
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
2 deletions
+11
-2
drivers/scsi/scsi.c
drivers/scsi/scsi.c
+2
-2
drivers/scsi/scsi_devinfo.c
drivers/scsi/scsi_devinfo.c
+1
-0
drivers/scsi/scsi_scan.c
drivers/scsi/scsi_scan.c
+6
-0
include/scsi/scsi_devinfo.h
include/scsi/scsi_devinfo.h
+2
-0
No files found.
drivers/scsi/scsi.c
View file @
f9e06c69
...
...
@@ -365,8 +365,8 @@ scsi_alloc_host_cmd_pool(struct Scsi_Host *shost)
if
(
!
pool
)
return
NULL
;
pool
->
cmd_name
=
kasprintf
(
GFP_KERNEL
,
"%s_cmd"
,
hostt
->
name
);
pool
->
sense_name
=
kasprintf
(
GFP_KERNEL
,
"%s_sense"
,
hostt
->
name
);
pool
->
cmd_name
=
kasprintf
(
GFP_KERNEL
,
"%s_cmd"
,
hostt
->
proc_
name
);
pool
->
sense_name
=
kasprintf
(
GFP_KERNEL
,
"%s_sense"
,
hostt
->
proc_
name
);
if
(
!
pool
->
cmd_name
||
!
pool
->
sense_name
)
{
scsi_free_host_cmd_pool
(
pool
);
return
NULL
;
...
...
drivers/scsi/scsi_devinfo.c
View file @
f9e06c69
...
...
@@ -222,6 +222,7 @@ static struct {
{
"PIONEER"
,
"CD-ROM DRM-602X"
,
NULL
,
BLIST_FORCELUN
|
BLIST_SINGLELUN
},
{
"PIONEER"
,
"CD-ROM DRM-604X"
,
NULL
,
BLIST_FORCELUN
|
BLIST_SINGLELUN
},
{
"PIONEER"
,
"CD-ROM DRM-624X"
,
NULL
,
BLIST_FORCELUN
|
BLIST_SINGLELUN
},
{
"Promise"
,
"VTrak E610f"
,
NULL
,
BLIST_SPARSELUN
|
BLIST_NO_RSOC
},
{
"Promise"
,
""
,
NULL
,
BLIST_SPARSELUN
},
{
"QUANTUM"
,
"XP34301"
,
"1071"
,
BLIST_NOTQ
},
{
"REGAL"
,
"CDC-4X"
,
NULL
,
BLIST_MAX5LUN
|
BLIST_SINGLELUN
},
...
...
drivers/scsi/scsi_scan.c
View file @
f9e06c69
...
...
@@ -900,6 +900,12 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result,
if
(
*
bflags
&
BLIST_USE_10_BYTE_MS
)
sdev
->
use_10_for_ms
=
1
;
/* some devices don't like REPORT SUPPORTED OPERATION CODES
* and will simply timeout causing sd_mod init to take a very
* very long time */
if
(
*
bflags
&
BLIST_NO_RSOC
)
sdev
->
no_report_opcodes
=
1
;
/* set the device running here so that slave configure
* may do I/O */
ret
=
scsi_device_set_state
(
sdev
,
SDEV_RUNNING
);
...
...
include/scsi/scsi_devinfo.h
View file @
f9e06c69
...
...
@@ -35,4 +35,6 @@
#define BLIST_SCSI3LUN 0x8000000
/* Scan more than 256 LUNs
for sequential scan */
#define BLIST_TRY_VPD_PAGES 0x10000000
/* Attempt to read VPD pages */
#define BLIST_NO_RSOC 0x20000000
/* don't try to issue RSOC */
#endif
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