diff options
| author |   Mikulas Patocka <mpatocka@redhat.com> | 2018-07-03 20:13:26 +0200 |
|---|---|---|
| committer |   Mike Snitzer <snitzer@redhat.com> | 2018-07-27 15:24:21 -0400 |
| commit | 518748b1a744c496a657a5a7923e49e002a6f259 (patch) | |
| tree | 64cf093f45adc886b3f337d1c875b23bc2528b51 /drivers | |
| parent | dm integrity: change 'suspending' variable from bool to int (diff) | |
| download | linux-dev-518748b1a744c496a657a5a7923e49e002a6f259.tar.xz linux-dev-518748b1a744c496a657a5a7923e49e002a6f259.zip | |
dm integrity: decouple common code in dm_integrity_map_continue()
Decouple how dm_integrity_map_continue() responds to being out of free
sectors and when add_new_range() fails.
This has no functional change, but helps prepare for the next commit.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/dm-integrity.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 0a8a4c2aa3ea..0829f18d91a3 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c @@ -1599,8 +1599,12 @@ retry: dio->range.n_sectors = min(dio->range.n_sectors, ic->free_sectors << ic->sb->log2_sectors_per_block); - if (unlikely(!dio->range.n_sectors)) - goto sleep; + if (unlikely(!dio->range.n_sectors)) { + if (from_map) + goto offload_to_thread; + sleep_on_endio_wait(ic); + goto retry; + } range_sectors = dio->range.n_sectors >> ic->sb->log2_sectors_per_block; ic->free_sectors -= range_sectors; journal_section = ic->free_section; @@ -1660,8 +1664,8 @@ retry: * stall bios on current->bio_list. * So, we offload the bio to a workqueue if we have to sleep. */ -sleep: if (from_map) { +offload_to_thread: spin_unlock_irq(&ic->endio_wait.lock); INIT_WORK(&dio->work, integrity_bio_wait); queue_work(ic->wait_wq, &dio->work); |