Messages in this thread | | | Date | Fri, 02 Nov 2012 16:33:09 -0400 | From | Sasha Levin <> | Subject | Re: [RFC] hlist: drop the node parameter from iterators |
| |
On 11/02/2012 04:16 PM, Linus Torvalds wrote: > On Thu, Nov 1, 2012 at 7:26 PM, Sasha Levin <sasha.levin@oracle.com> wrote: >> >> Here are some stats: >> >> - Applying the patch from -next on top of your current git head >> results in 3 conflicts. >> >> - Applying the patch from your current git head on top of v3.6 results >> in 18 conflicts. >> >> - Applying the patch from 3.6 on top of 3.5 results in 25 conflicts. > > Ok, that sounds slightly painful, but not unmanageable. > > Can you send me the actual patch, and I'll mull on this a bit more? I > could run the coccinelle script myself, but I assume (maybe > incorrectly?) that there are manual fixes to clean some stuff up > afterwared..
You're right about that. There are 2 things which needs to be done after running the script:
- Coccinelle doesn't handle cases where there are multiple variables in the declaration. That means that things like:
struct hlist_node *node, *tmp;
Have to be fixed manually.
That's common when hlist_for_each_entry_safe() is used afterwards.
- Some places actually use node for their needs, while coccinelle can automatically fix that to use '(ptr)->member', I'd rather go through those places manually and make sure we're doing the right thing.
Do you want the patch on top of your git head, or on top of -next?
Thanks, Sasha
| |