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

dm integrity: allow large ranges to be described 

Change n_sectors data type from unsigned to sector_t.  Following commits
will need to lock large ranges.

Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
This commit is contained in:
Mikulas Patocka 2019-04-29 14:57:21 +02:00 committed by Mike Snitzer
parent d5027e0345
commit 4f43446ddf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/md/dm-integrity.c
View File

@ -246,7 +246,7 @@ struct dm_integrity_c {
struct dm_integrity_range { struct dm_integrity_range {
sector_t logical_sector; sector_t logical_sector;
unsigned n_sectors; sector_t n_sectors;
bool waiting; bool waiting;
union { union {
struct rb_node node; struct rb_node node;
@ -1695,7 +1695,7 @@ retry:
unsigned ws, we, range_sectors; unsigned ws, we, range_sectors;
dio->range.n_sectors = min(dio->range.n_sectors, dio->range.n_sectors = min(dio->range.n_sectors,
ic->free_sectors << ic->sb->log2_sectors_per_block); (sector_t)ic->free_sectors << ic->sb->log2_sectors_per_block);
if (unlikely(!dio->range.n_sectors)) { if (unlikely(!dio->range.n_sectors)) {
if (from_map) if (from_map)
goto offload_to_thread; goto offload_to_thread;
@ -2153,7 +2153,7 @@ next_chunk:
get_area_and_offset(ic, range.logical_sector, &area, &offset); get_area_and_offset(ic, range.logical_sector, &area, &offset);
range.n_sectors = min((sector_t)RECALC_SECTORS, ic->provided_data_sectors - range.logical_sector); range.n_sectors = min((sector_t)RECALC_SECTORS, ic->provided_data_sectors - range.logical_sector);
if (!ic->meta_dev) if (!ic->meta_dev)
range.n_sectors = min(range.n_sectors, (1U << ic->sb->log2_interleave_sectors) - (unsigned)offset); range.n_sectors = min(range.n_sectors, ((sector_t)1U << ic->sb->log2_interleave_sectors) - (unsigned)offset);
if (unlikely(!add_new_range(ic, &range, true))) if (unlikely(!add_new_range(ic, &range, true)))
wait_and_add_new_range(ic, &range); wait_and_add_new_range(ic, &range);