UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

dm: always allow one page in dm_merge_bvec 

Some callers assume they can always add at least one page to an empty bio,
so dm_merge_bvec should not return 0 in this case: we'll reject the I/O
later after the bio is submitted.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
This commit is contained in:
Mikulas Patocka 2008-10-01 14:39:17 +01:00 committed by Alasdair G Kergon
parent d3a47e82b6
commit 5037108acd
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/md/dm.c
View File

@ -837,10 +837,10 @@ static int dm_merge_bvec(struct request_queue *q,
struct dm_table *map = dm_get_table(md); struct dm_table *map = dm_get_table(md);
struct dm_target *ti; struct dm_target *ti;
sector_t max_sectors; sector_t max_sectors;
int max_size; int max_size = 0;
if (unlikely(!map)) if (unlikely(!map))
return 0; goto out;
ti = dm_table_find_target(map, bvm->bi_sector); ti = dm_table_find_target(map, bvm->bi_sector);
@ -861,14 +861,15 @@ static int dm_merge_bvec(struct request_queue *q,
if (max_size && ti->type->merge) if (max_size && ti->type->merge)
max_size = ti->type->merge(ti, bvm, biovec, max_size); max_size = ti->type->merge(ti, bvm, biovec, max_size);
dm_table_put(map);
out:
/* /*
* Always allow an entire first page * Always allow an entire first page
*/ */
if (max_size <= biovec->bv_len && !(bvm->bi_size >> SECTOR_SHIFT)) if (max_size <= biovec->bv_len && !(bvm->bi_size >> SECTOR_SHIFT))
max_size = biovec->bv_len; max_size = biovec->bv_len;
dm_table_put(map);
return max_size; return max_size;
} }