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
6344a5cd
Commit
6344a5cd
authored
Jan 26, 2016
by
James Bottomley
Browse files
Options
Browse Files
Download
Plain Diff
Merge remote-tracking branch 'mkp-scsi/4.5/scsi-fixes' into fixes
parents
13b43891
d0eb20a8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
1 deletion
+3
-1
drivers/scsi/hisi_sas/Kconfig
drivers/scsi/hisi_sas/Kconfig
+2
-0
drivers/scsi/sd.c
drivers/scsi/sd.c
+1
-1
No files found.
drivers/scsi/hisi_sas/Kconfig
View file @
6344a5cd
config SCSI_HISI_SAS
tristate "HiSilicon SAS"
depends on HAS_DMA
depends on ARM64 || COMPILE_TEST
select SCSI_SAS_LIBSAS
select BLK_DEV_INTEGRITY
help
...
...
drivers/scsi/sd.c
View file @
6344a5cd
...
...
@@ -2893,7 +2893,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
sdkp
->
opt_xfer_blocks
<=
SD_DEF_XFER_BLOCKS
&&
sdkp
->
opt_xfer_blocks
*
sdp
->
sector_size
>=
PAGE_CACHE_SIZE
)
rw_max
=
q
->
limits
.
io_opt
=
logical_to_sectors
(
sdp
,
sdkp
->
opt_xfer_blocks
)
;
sdkp
->
opt_xfer_blocks
*
sdp
->
sector_size
;
else
rw_max
=
BLK_DEF_MAX_SECTORS
;
...
...
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