Skip to contentSkip to conversation

tmem: fix regression from c/s 19886 "Remove page-scrub lists and async scrubbing"

PATCH New Dan Magenheimer 1 participant 1 message Nov 16, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tmem: fix regression from c/s 19886 "Remove page-scrub lists and async scrubbing"

Fix incorrect page_list macro choice from page-scrub code cleanup.

xen/common/tmem_xen.c +3 -2
diff -r bec27eb6f72c xen/common/tmem_xen.c
@@ -213,12 +213,13 @@ EXPORT void tmh_release_avail_pages_to_h
     spin_lock(&tmh_page_list_lock);
     while ( !page_list_empty(&tmh_page_list) )
     {
-        struct page_info *pg = page_list_first(&tmh_page_list);
+        struct page_info *pg = page_list_remove_head(&tmh_page_list);
         scrub_one_page(pg);
+        tmh_page_list_pages--;
         free_domheap_page(pg);
     }
+    ASSERT(tmh_page_list_pages == 0);
     INIT_PAGE_LIST_HEAD(&tmh_page_list);
-    tmh_page_list_pages = 0;
     spin_unlock(&tmh_page_list_lock);
 }
xen/common/tmem_xen.c +3 -2
diff -r bec27eb6f72c xen/common/tmem_xen.c
@@ -213,12 +213,13 @@ EXPORT void tmh_release_avail_pages_to_h
     spin_lock(&tmh_page_list_lock);
     while ( !page_list_empty(&tmh_page_list) )
     {
-        struct page_info *pg = page_list_first(&tmh_page_list);
+        struct page_info *pg = page_list_remove_head(&tmh_page_list);
         scrub_one_page(pg);
+        tmh_page_list_pages--;
         free_domheap_page(pg);
     }
+    ASSERT(tmh_page_list_pages == 0);
     INIT_PAGE_LIST_HEAD(&tmh_page_list);
-    tmh_page_list_pages = 0;
     spin_unlock(&tmh_page_list_lock);
 }
 

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel