hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dm table: remove merge_bvec sector restriction 

Remove max_sector restriction - merge function replaced it.

Signed-off-by: Milan Broz <mbroz@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Milan Broz 2008-07-21 12:00:39 +01:00 committed by Alasdair G Kergon
parent 7bc3447b69
commit 9980c638a6
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/md/dm-table.c
View File

@ -506,14 +506,13 @@ void dm_set_device_limits(struct dm_target *ti, struct block_device *bdev)
rs->max_sectors = rs->max_sectors =
min_not_zero(rs->max_sectors, q->max_sectors); min_not_zero(rs->max_sectors, q->max_sectors);
/* FIXME: Device-Mapper on top of RAID-0 breaks because DM /*
* currently doesn't honor MD's merge_bvec_fn routine. * Check if merge fn is supported.
* In this case, we'll force DM to use PAGE_SIZE or * If not we'll force DM to use PAGE_SIZE or
* smaller I/O, just to be safe. A better fix is in the * smaller I/O, just to be safe.
* works, but add this for the time being so it will at
* least operate correctly.
*/ */
if (q->merge_bvec_fn)
if (q->merge_bvec_fn && !ti->type->merge)
rs->max_sectors = rs->max_sectors =
min_not_zero(rs->max_sectors, min_not_zero(rs->max_sectors,
(unsigned int) (PAGE_SIZE >> 9)); (unsigned int) (PAGE_SIZE >> 9));