mm/swapfile.c: use list_for_each_entry_safe in free_swap_count_continuations

Use list_for_each_entry_safe() instead of list_for_each_safe() to
simplify the code.

Signed-off-by: Geliang Tang <geliangtang@163.com>
Cc: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 77551a553f57d0d8657854a4f176ec109f4c836a..e6b8591a3ed27641b70179265609671135ae4127 100644 (file)
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -2953,11 +2953,10 @@ static void free_swap_count_continuations(struct swap_info_struct *si)
                struct page *head;
                head = vmalloc_to_page(si->swap_map + offset);
                if (page_private(head)) {
-                       struct list_head *this, *next;
-                       list_for_each_safe(this, next, &head->lru) {
-                               struct page *page;
-                               page = list_entry(this, struct page, lru);
-                               list_del(this);
+                       struct page *page, *next;
+
+                       list_for_each_entry_safe(page, next, &head->lru, lru) {
+                               list_del(&page->lru);
                                __free_page(page);
                        }
                }