mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
hlist: drop the node parameter from iterators
I'm not sure why, but the hlist for each entry iterators were conceived
list_for_each_entry(pos, head, member)
The hlist ones were greedy and wanted an extra parameter:
hlist_for_each_entry(tpos, pos, head, member)
Why did they need an extra pos parameter? I'm not quite sure. Not only
they don't really need it, it also prevents the iterator from looking
exactly like the list iterator, which is unfortunate.
Besides the semantic patch, there was some manual work required:
- Fix up the actual hlist iterators in linux/list.h
- Fix up the declaration of other iterators based on the hlist ones.
- A very small amount of places were using the 'node' parameter, this
was modified to use 'obj->member' instead.
- Coccinelle didn't handle the hlist_for_each_entry_safe iterator
properly, so those had to be fixed up manually.
The semantic patch which is mostly the work of Peter Senna Tschudin is here:
@@
iterator name hlist_for_each_entry, hlist_for_each_entry_continue, hlist_for_each_entry_from, hlist_for_each_entry_rcu, hlist_for_each_entry_rcu_bh, hlist_for_each_entry_continue_rcu_bh, for_each_busy_worker, ax25_uid_for_each, ax25_for_each, inet_bind_bucket_for_each, sctp_for_each_hentry, sk_for_each, sk_for_each_rcu, sk_for_each_from, sk_for_each_safe, sk_for_each_bound, hlist_for_each_entry_safe, hlist_for_each_entry_continue_rcu, nr_neigh_for_each, nr_neigh_for_each_safe, nr_node_for_each, nr_node_for_each_safe, for_each_gfn_indirect_valid_sp, for_each_gfn_sp, for_each_host;
type T;
expression a,c,d,e;
identifier b;
statement S;
@@
-T b;
<+... when != b
(
hlist_for_each_entry(a,
- b,
c, d) S
|
hlist_for_each_entry_continue(a,
- b,
c) S
|
hlist_for_each_entry_from(a,
- b,
c) S
|
hlist_for_each_entry_rcu(a,
- b,
c, d) S
|
hlist_for_each_entry_rcu_bh(a,
- b,
c, d) S
|
hlist_for_each_entry_continue_rcu_bh(a,
- b,
c) S
|
for_each_busy_worker(a, c,
- b,
d) S
|
ax25_uid_for_each(a,
- b,
c) S
|
ax25_for_each(a,
- b,
c) S
|
inet_bind_bucket_for_each(a,
- b,
c) S
|
sctp_for_each_hentry(a,
- b,
c) S
|
sk_for_each(a,
- b,
c) S
|
sk_for_each_rcu(a,
- b,
c) S
|
sk_for_each_from
-(a, b)
+(a)
S
+ sk_for_each_from(a) S
|
sk_for_each_safe(a,
- b,
c, d) S
|
sk_for_each_bound(a,
- b,
c) S
|
hlist_for_each_entry_safe(a,
- b,
c, d, e) S
|
hlist_for_each_entry_continue_rcu(a,
- b,
c) S
|
nr_neigh_for_each(a,
- b,
c) S
|
nr_neigh_for_each_safe(a,
- b,
c, d) S
|
nr_node_for_each(a,
- b,
c) S
|
nr_node_for_each_safe(a,
- b,
c, d) S
|
- for_each_gfn_sp(a, c, d, b) S
+ for_each_gfn_sp(a, c, d) S
|
- for_each_gfn_indirect_valid_sp(a, c, d, b) S
+ for_each_gfn_indirect_valid_sp(a, c, d) S
|
for_each_host(a,
- b,
c) S
|
for_each_host_safe(a,
- b,
c, d) S
|
for_each_mesh_entry(a,
- b,
c, d) S
)
...+>
[[email protected]: drop bogus change from net/ipv4/raw.c]
[[email protected]: drop bogus hunk from net/ipv6/raw.c]
[[email protected]: checkpatch fixes]
[[email protected]: fix warnings]
[[email protected]: redo intrusive kvm changes]
Tested-by: Peter Senna Tschudin <[email protected]>
Acked-by: Paul E. McKenney <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
Cc: Wu Fengguang <[email protected]>
Cc: Marcelo Tosatti <[email protected]>
Cc: Gleb Natapov <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
1e142b29e2
commit
b67bfe0d42
218 changed files with 987 additions and 1494 deletions
|
|
@ -280,11 +280,10 @@ static struct mmu_notifier *mmu_find_ops(struct mm_struct *mm,
|
|||
const struct mmu_notifier_ops *ops)
|
||||
{
|
||||
struct mmu_notifier *mn, *gru_mn = NULL;
|
||||
struct hlist_node *n;
|
||||
|
||||
if (mm->mmu_notifier_mm) {
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(mn, n, &mm->mmu_notifier_mm->list,
|
||||
hlist_for_each_entry_rcu(mn, &mm->mmu_notifier_mm->list,
|
||||
hlist)
|
||||
if (mn->ops == ops) {
|
||||
gru_mn = mn;
|
||||
|
|
|
|||
|
|
@ -127,9 +127,8 @@ static struct dbell_entry *dbell_index_table_find(u32 idx)
|
|||
{
|
||||
u32 bucket = VMCI_DOORBELL_HASH(idx);
|
||||
struct dbell_entry *dbell;
|
||||
struct hlist_node *node;
|
||||
|
||||
hlist_for_each_entry(dbell, node, &vmci_doorbell_it.entries[bucket],
|
||||
hlist_for_each_entry(dbell, &vmci_doorbell_it.entries[bucket],
|
||||
node) {
|
||||
if (idx == dbell->idx)
|
||||
return dbell;
|
||||
|
|
@ -359,12 +358,10 @@ static void dbell_fire_entries(u32 notify_idx)
|
|||
{
|
||||
u32 bucket = VMCI_DOORBELL_HASH(notify_idx);
|
||||
struct dbell_entry *dbell;
|
||||
struct hlist_node *node;
|
||||
|
||||
spin_lock_bh(&vmci_doorbell_it.lock);
|
||||
|
||||
hlist_for_each_entry(dbell, node,
|
||||
&vmci_doorbell_it.entries[bucket], node) {
|
||||
hlist_for_each_entry(dbell, &vmci_doorbell_it.entries[bucket], node) {
|
||||
if (dbell->idx == notify_idx &&
|
||||
atomic_read(&dbell->active) == 1) {
|
||||
if (dbell->run_delayed) {
|
||||
|
|
|
|||
|
|
@ -46,11 +46,10 @@ static struct vmci_resource *vmci_resource_lookup(struct vmci_handle handle,
|
|||
enum vmci_resource_type type)
|
||||
{
|
||||
struct vmci_resource *r, *resource = NULL;
|
||||
struct hlist_node *node;
|
||||
unsigned int idx = vmci_resource_hash(handle);
|
||||
|
||||
rcu_read_lock();
|
||||
hlist_for_each_entry_rcu(r, node,
|
||||
hlist_for_each_entry_rcu(r,
|
||||
&vmci_resource_table.entries[idx], node) {
|
||||
u32 cid = r->handle.context;
|
||||
u32 rid = r->handle.resource;
|
||||
|
|
@ -146,12 +145,11 @@ void vmci_resource_remove(struct vmci_resource *resource)
|
|||
struct vmci_handle handle = resource->handle;
|
||||
unsigned int idx = vmci_resource_hash(handle);
|
||||
struct vmci_resource *r;
|
||||
struct hlist_node *node;
|
||||
|
||||
/* Remove resource from hash table. */
|
||||
spin_lock(&vmci_resource_table.lock);
|
||||
|
||||
hlist_for_each_entry(r, node, &vmci_resource_table.entries[idx], node) {
|
||||
hlist_for_each_entry(r, &vmci_resource_table.entries[idx], node) {
|
||||
if (vmci_handle_is_equal(r->handle, resource->handle)) {
|
||||
hlist_del_init_rcu(&r->node);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in a new issue