[3/4] mm/compaction: use compact_unlock_should_abort in isolate_migratepages_block
Commit Message
Use compact_unlock_should_abort in isolate_migratepages_block to remove
repeat code.
Signed-off-by: Kemeng Shi <shikemeng@huaweicloud.com>
---
mm/compaction.c | 18 ++++--------------
1 file changed, 4 insertions(+), 14 deletions(-)
@@ -909,20 +909,10 @@ isolate_migratepages_block(struct compact_control *cc, unsigned long low_pfn,
* contention, to give chance to IRQs. Abort completely if
* a fatal signal is pending.
*/
- if (!(low_pfn % COMPACT_CLUSTER_MAX)) {
- if (locked) {
- spin_unlock_irqrestore(locked, flags);
- locked = NULL;
- }
-
- if (fatal_signal_pending(current)) {
- cc->contended = true;
- ret = -EINTR;
-
- goto fatal_pending;
- }
-
- cond_resched();
+ if (!(low_pfn % COMPACT_CLUSTER_MAX) &&
+ compact_unlock_should_abort(&locked, flags, cc)) {
+ ret = -EINTR;
+ goto fatal_pending;
}
nr_scanned++;