Re: Linux-2.4.5-ac17 --- Where is the truncate_inode_pages speedup patch?

[Dieter Nützel]

Hello Alan,

I use it all the time and it is not pre6 stuff related...:-)

Thanks,
	Dieter

--- linux/mm/filemap.c    Mon May 28 13:31:49 2001
+++ linux/mm/filemap.c     Mon Jun 11 23:31:08 2001
@@ -230,17 +230,17 @@
                unsigned long offset;
 
                page = list_entry(curr, struct page, list);
-               curr = curr->next;
                offset = page->index;
 
                /* Is one of the pages to truncate? */
                if ((offset >= start) || (*partial && (offset + 1) == start)) 
{
+                       list_del(head);
+                       list_add(head, curr);
                        if (TryLockPage(page)) {
                                page_cache_get(page);
                                spin_unlock(&pagecache_lock);
                                wait_on_page(page);
-                               page_cache_release(page);
-                               return 1;
+                               goto out_restart;
                        }
                        page_cache_get(page);
                        spin_unlock(&pagecache_lock);
@@ -252,11 +252,15 @@
                                truncate_complete_page(page);
 
                        UnlockPage(page);
-                       page_cache_release(page);
-                       return 1;
+                       goto out_restart;
                }
+               curr = curr->next;
        }
        return 0;
+out_restart:
+       page_cache_release(page);
+       spin_lock(&pagecache_lock);
+       return 1;
 }
 
 
@@ -273,15 +277,19 @@
 {
        unsigned long start = (lstart + PAGE_CACHE_SIZE - 1) >> 
PAGE_CACHE_SHIFT;
        unsigned partial = lstart & (PAGE_CACHE_SIZE - 1);
+       int complete;
 
-repeat:
        spin_lock(&pagecache_lock);
-       if (truncate_list_pages(&mapping->clean_pages, start, &partial))
-               goto repeat;
-       if (truncate_list_pages(&mapping->dirty_pages, start, &partial))
-               goto repeat;
-       if (truncate_list_pages(&mapping->locked_pages, start, &partial))
-               goto repeat;
+       do {
+               complete = 1;
+               while (truncate_list_pages(&mapping->clean_pages, start, 
&partial))
+                       complete = 0;
+               while (truncate_list_pages(&mapping->dirty_pages, start, 
&partial))
+                       complete = 0;
+               while (truncate_list_pages(&mapping->locked_pages, start, 
&partial))
+                       complete = 0;
+       } while (!complete);
+       /* Traversed all three lists without dropping the lock */
        spin_unlock(&pagecache_lock);
 }