mm-swapfile-use-list_prevnext_entry-instead-of-open-coding.patch removed from -mm tree
The patch titled
Subject: mm/swapfile: use list_{prev,next}_entry() instead of open-coding
has been removed from the -mm tree. Its filename was
mm-swapfile-use-list_prevnext_entry-instead-of-open-coding.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: chenqiwu <[email protected]>
Subject: mm/swapfile: use list_{prev,next}_entry() instead of open-coding
Use list_{prev,next}_entry() instead of list_entry() for better code readability.
Signed-off-by chenqiwu <[email protected]>
Reviewed-by Andrew Morton <[email protected]>
Cc Matthew Wilcox <[email protected]>
Cc David Hildenbrand <[email protected]>
Cc Wei Yang <[email protected]>
Cc Michal Hocko <[email protected]>
Cc Pankaj Gupta <[email protected]>
Cc Yang Shi <[email protected]>
Cc Qian Cai <[email protected]>
Cc Baoquan He <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
mm/swapfile.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
mm/swapfile.c renamed from mm/swapfile.c~mm-swapfile-use-list_prevnext_entry-instead-of-open-coding +6 -10
@@ -3654,7 +3654,7 @@ static bool swap_count_continued(structspin_lock (&si->cont_lock); offset &= ~PAGE_MASK ; - page = list_entry(head->lru.next, struct page, lru); + page =list_next_entry (head, lru); map =kmap_atomic (page) + offset;if (count ==SWAP_MAP_MAX )/* initial increment from swap_map */
@@ -3666,13 +3666,13 @@ static bool swap_count_continued(struct*/ while (*map == (SWAP_CONT_MAX |COUNT_CONTINUED )) {kunmap_atomic (map); - page = list_entry(page->lru.next, struct page, lru); + page =list_next_entry (page, lru);BUG_ON (page == head); map =kmap_atomic (page) + offset; }if (*map ==SWAP_CONT_MAX ) {kunmap_atomic (map); - page = list_entry(page->lru.next, struct page, lru); + page =list_next_entry (page, lru);if (page == head) { ret = false;/* add count continuation */ goto out;
@@ -3682,12 +3682,10 @@ init_map: *map = 0; /* we didn't zero } *map +=1 ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); -while (page != head) { +while ((page =list_prev_entry (page, lru)) != head) { map =kmap_atomic (page) + offset; *map =COUNT_CONTINUED ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); } ret = true;/* incremented */
@@ -3698,7 +3696,7 @@ init_map: *map = 0; /* we didn't zeroBUG_ON (count !=COUNT_CONTINUED );while (*map ==COUNT_CONTINUED ) {kunmap_atomic (map); - page = list_entry(page->lru.next, struct page, lru); + page =list_next_entry (page, lru);BUG_ON (page == head); map =kmap_atomic (page) + offset; }
@@ -3707,13 +3705,11 @@ init_map: *map = 0; /* we didn't zeroif (*map ==0 ) count =0 ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); -while (page != head) { +while ((page =list_prev_entry (page, lru)) != head) { map =kmap_atomic (page) + offset; *map =SWAP_CONT_MAX | count; count =COUNT_CONTINUED ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); } ret = count ==COUNT_CONTINUED ; }
_
Patches currently in -mm which might be from [email protected] are
mm-memblock-fix-minor-typo-and-unclear-comment.patch mm-replace-zero-length-array-with-flexible-array-member.patch