Re: [PATCH V4 0/4] mm: frontswap: overview

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 08/05/2011 01:26 PM, Dan Magenheimer wrote:
>> From: Seth Jennings [mailto:sjenning@xxxxxxxxxxxxxxxxxx]
>> Sent: Friday, August 05, 2011 9:56 AM
>> To: Dan Magenheimer
>> Cc: linux-mm@xxxxxxxxx; ngupta@xxxxxxxxxx; Brian King
>> Subject: Re: [PATCH V4 0/4] mm: frontswap: overview
>>
>> Dan,
>>
>> What is the plan for getting this upstream?  Are there some issues or objections that haven't been
>> addressed?
>> --
>> Seth
> 
> Hi Seth --
> 
> The only significant objection I'm aware of is that there hasn't been
> a strong demand for frontswap yet, partly due to the fact that most
> of the interested parties have been communicating offlist.
> 
> Can I take this email as an "Acked-by"?  I will be posting V5
> next week (V4->V5: an allocation-time bug fix by Bob Liu, a
> handful of syntactic clarifications reported by Konrad Wilk,
> and rebase to linux-3.1-rc1.)  Soon after, V5 will be in linux-next
> and I plan to lobby the relevant maintainers to merge frontswap
> for the linux-3.2 window... and would welcome your public support.

Yes, this is something we want to get upstream.  So consider this 
an "Acked-by".

There was also a build break in the frontswap v4 patches:
  CC      mm/swapfile.o
mm/swapfile.c: In function ‘enable_swap_info’:
mm/swapfile.c:1549:21: error: ‘frontswap_map’ undeclared (first use in this function)
mm/swapfile.c:1549:21: note: each undeclared identifier is reported only once for each function it appears in

I patched it with:

diff --git a/mm/swapfile.c b/mm/swapfile.c
index 160261c..f358763 100644
--- a/mm/swapfile.c
+++ b/mm/swapfile.c
@@ -1546,7 +1546,6 @@ static void enable_swap_info(struct swap_info_struct *p, i
        else
                p->prio = --least_priority;
        p->swap_map = swap_map;
-       p->frontswap_map = frontswap_map;
        p->flags |= SWP_WRITEOK;
        nr_swap_pages += p->pages;
        total_swap_pages += p->pages;
@@ -2153,6 +2152,7 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, 
                prio =
                  (swap_flags & SWAP_FLAG_PRIO_MASK) >> SWAP_FLAG_PRIO_SHIFT;
        enable_swap_info(p, prio, swap_map);
+       p->frontswap_map = frontswap_map;
 
        printk(KERN_INFO "Adding %uk swap on %s.  "
                        "Priority:%d extents:%d across:%lluk %s%s%s\n",

Also had a merge conflict in mm/swapfile.c when rebasing to 3.0+
with this commit:

commit 72788c385604523422592249c19cba0187021e9b
Author: David Rientjes <rientjes@xxxxxxxxxx>
Date:   Tue May 24 17:11:40 2011 -0700

    oom: replace PF_OOM_ORIGIN with toggling oom_score_adj

git describe 72788c385604523422592249c19cba0187021e9b
v2.6.39-5681-g72788c3

A rebasing the patches to 3.0+ should fix that though.

Thanks Dan!

--
Seth

> 
> Thanks,
> Dan

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>


[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]