diff --git a/mm/swapfile.c b/mm/swapfile.c
index 3a17e40f4c95..0a0c4118759e 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -730,6 +730,9 @@ static bool cluster_scan_range(struct swap_info_struct *si,
 	unsigned long offset, end = start + nr_pages;
 	unsigned char *map = si->swap_map;
 
+	if (cluster_is_empty(ci))
+		return true;
+
 	for (offset = start; offset < end; offset++) {
 		switch (READ_ONCE(map[offset])) {
 		case 0: