RepoMirrors/mars
1
0
Fork 0
mirror of https://github.com/schoebel/mars synced 2025-02-20 06:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

copy: factor out and simplify reset code

Browse Source
This commit is contained in:
Thomas Schoebel-Theuer 2023-05-25 22:04:30 +02:00 committed by Thomas Schoebel-Theuer
parent d41ea13d37
commit e58488a777
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
kernel/mars_copy.c
View File

@ -874,23 +874,13 @@ idle:
}
static
bool wait_reset_clash(struct copy_brick *brick, bool do_reset)
bool wait_reset_clash(struct copy_brick *brick)
{
if (!READ_ONCE(brick->clash))
return false;
if (atomic_read(&brick->copy_read_flight) + atomic_read(&brick->copy_write_flight) > 0) {
/* wait until all pending copy IO has finished
*/
return true;
}
if (do_reset) {
MARS_DBG("clash\n");
_clear_all_mref(brick);
_clear_state_table(brick);
clear_clash(brick);
}
return false;
}
@ -904,7 +894,7 @@ int _run_copy(struct copy_brick *brick, loff_t this_start)
bool is_first;
if (READ_ONCE(brick->clash) &&
wait_reset_clash(brick, false))
wait_reset_clash(brick))
return 0;
if (this_start < brick->copy_last)
@ -1033,10 +1023,16 @@ int _run_copy(struct copy_brick *brick, loff_t this_start)
}
}
/* when necessary, reset and allow restart */
if (READ_ONCE(brick->clash) &&
wait_reset_clash(brick, true)) {
brick_msleep(100);
notify_clash(brick, true);
if (READ_ONCE(brick->clash)) {
if (wait_reset_clash(brick)) {
brick_msleep(100);
notify_clash(brick, true);
} else {
MARS_DBG("clash\n");
_clear_all_mref(brick);
_clear_state_table(brick);
clear_clash(brick);
}
}
return progress;
}