Messages in this thread | | | Date | Mon, 2 Dec 2002 15:28:30 +0000 (GMT) | From | Hugh Dickins <> | Subject | Re: [PATCH] rmap15a incremental diff against 2.4.20-ac1 |
| |
On Mon, 2 Dec 2002, Javier Marcet wrote:
> I had sent this patch a few hours ago but didn't see it on the list... > Anyway, there was a mistake in the diff I sent so there you go a new > version. > I've merged the incremental diffs of rmap (rmap14c-rmap15 and > rmap15-rmapa) with 2.4.20-ac1 > There was no inconsistency but in three spots. > Namely: > > ...from the original rmap... > diff -Nru a/mm/shmem.c b/mm/shmem.c > --- a/mm/shmem.c Mon Nov 18 10:28:28 2002 > +++ b/mm/shmem.c Mon Nov 18 10:28:28 2002 > @@ -557,7 +557,7 @@ > unsigned long flags; > > /* Look it up and read it in.. */ > - page = find_get_page(&swapper_space, entry->val); > + page = find_pagecache_page(&swapper_space, entry->val); > if (!page) { > swp_entry_t swap = *entry; > spin_unlock (&info->lock); > > ...to how I left it... > diff -purN linux-2.4.20-ac1/mm/shmem.c linux-2.4.20-ac1-rmap15a/mm/shmem.c > --- linux-2.4.20-ac1/mm/shmem.c 2002-12-01 11:01:04.000000000 +0100 > +++ linux-2.4.20-ac1-rmap15a/mm/shmem.c 2002-12-01 10:43:15.000000000 +0100 > @@ -593,7 +593,7 @@ repeat: > unsigned long flags; > > /* Look it up and read it in.. */ > - page = lookup_swap_cache(*entry); > + page = find_pagecache_page(&swapper_space, entry->val); > if (!page) { > swp_entry_t swap = *entry; > spin_unlock (&info->lock); > > I didn't know which version to leave, rmap's or original ac's
It doesn't matter a great deal, but leaving it as lookup_swap_cache would be correct - the difference lies solely in the swap cache "find" statistics shown by AltSysRqM, which find_get_page shortcircuited (whereas "add" and "delete" were getting updated for mm/shmem.c).
lookup_swap_cache is itself patched to say find_pagecache_page instead of find_get_page - though why an -rmap patch should be changing that well-established name escapes me: makes maintenance more tiresome.
Hugh
- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |