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
nexedi
linux
Commits
49ce5b5f
Commit
49ce5b5f
authored
Oct 27, 2016
by
James Bottomley
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'mkp-scsi/4.9/scsi-fixes' into fixes
parents
602432c1
2bf7dc84
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
17 deletions
+6
-17
drivers/scsi/arcmsr/arcmsr_hba.c
drivers/scsi/arcmsr/arcmsr_hba.c
+0
-9
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/megaraid/megaraid_sas_base.c
+5
-8
drivers/scsi/scsi_debug.c
drivers/scsi/scsi_debug.c
+1
-0
No files found.
drivers/scsi/arcmsr/arcmsr_hba.c
View file @
49ce5b5f
...
...
@@ -2636,18 +2636,9 @@ static int arcmsr_queue_command_lck(struct scsi_cmnd *cmd,
struct
AdapterControlBlock
*
acb
=
(
struct
AdapterControlBlock
*
)
host
->
hostdata
;
struct
CommandControlBlock
*
ccb
;
int
target
=
cmd
->
device
->
id
;
int
lun
=
cmd
->
device
->
lun
;
uint8_t
scsicmd
=
cmd
->
cmnd
[
0
];
cmd
->
scsi_done
=
done
;
cmd
->
host_scribble
=
NULL
;
cmd
->
result
=
0
;
if
((
scsicmd
==
SYNCHRONIZE_CACHE
)
||
(
scsicmd
==
SEND_DIAGNOSTIC
)){
if
(
acb
->
devstate
[
target
][
lun
]
==
ARECA_RAID_GONE
)
{
cmd
->
result
=
(
DID_NO_CONNECT
<<
16
);
}
cmd
->
scsi_done
(
cmd
);
return
0
;
}
if
(
target
==
16
)
{
/* virtual device for iop message transfer */
arcmsr_handle_virtual_command
(
acb
,
cmd
);
...
...
drivers/scsi/megaraid/megaraid_sas_base.c
View file @
49ce5b5f
...
...
@@ -1700,16 +1700,13 @@ megasas_queue_command(struct Scsi_Host *shost, struct scsi_cmnd *scmd)
goto
out_done
;
}
switch
(
scmd
->
cmnd
[
0
])
{
case
SYNCHRONIZE_CACHE
:
/*
* FW takes care of flush cache on its own
* No need to send it down
*/
/*
* FW takes care of flush cache on its own for Virtual Disk.
* No need to send it down for VD. For JBOD send SYNCHRONIZE_CACHE to FW.
*/
if
((
scmd
->
cmnd
[
0
]
==
SYNCHRONIZE_CACHE
)
&&
MEGASAS_IS_LOGICAL
(
scmd
))
{
scmd
->
result
=
DID_OK
<<
16
;
goto
out_done
;
default:
break
;
}
return
instance
->
instancet
->
build_and_issue_cmd
(
instance
,
scmd
);
...
...
drivers/scsi/scsi_debug.c
View file @
49ce5b5f
...
...
@@ -5134,6 +5134,7 @@ static void __exit scsi_debug_exit(void)
bus_unregister
(
&
pseudo_lld_bus
);
root_device_unregister
(
pseudo_primary
);
vfree
(
map_storep
);
vfree
(
dif_storep
);
vfree
(
fake_storep
);
kfree
(
sdebug_q_arr
);
...
...
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