| Message ID | 20090425133052.4cb711f5@nehalam |
|---|---|
| State | Not Applicable, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sat, Apr 25, 2009 at 01:30:52PM -0700, Stephen Hemminger wrote: > Epilogue due to master Jarek. Lockdep carest not about the locking > doth bestowed. Therefore no keys are needed. > > Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> Very nice! I guess this Shakespeare guy Will sign off this all too. ;-) Thanks, Jarek P. > > --- > net/netfilter/x_tables.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > --- a/net/netfilter/x_tables.c 2009-04-25 13:25:48.115026283 -0700 > +++ b/net/netfilter/x_tables.c 2009-04-25 13:26:15.646215635 -0700 > @@ -1145,14 +1145,9 @@ static int __init xt_init(void) > { > unsigned int i; > int rv; > - static struct lock_class_key xt_lock_key[NR_CPUS]; > > - for_each_possible_cpu(i) { > - rwlock_t *lock = &per_cpu(xt_info_locks, i); > - > - rwlock_init(lock); > - lockdep_set_class(lock, xt_lock_key+i); > - } > + for_each_possible_cpu(i) > + rwlock_init(&per_cpu(xt_info_locks, i)); > > xt = kmalloc(sizeof(struct xt_af) * NFPROTO_NUMPROTO, GFP_KERNEL); > if (!xt) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
--- a/net/netfilter/x_tables.c 2009-04-25 13:25:48.115026283 -0700 +++ b/net/netfilter/x_tables.c 2009-04-25 13:26:15.646215635 -0700 @@ -1145,14 +1145,9 @@ static int __init xt_init(void) { unsigned int i; int rv; - static struct lock_class_key xt_lock_key[NR_CPUS]; - for_each_possible_cpu(i) { - rwlock_t *lock = &per_cpu(xt_info_locks, i); - - rwlock_init(lock); - lockdep_set_class(lock, xt_lock_key+i); - } + for_each_possible_cpu(i) + rwlock_init(&per_cpu(xt_info_locks, i)); xt = kmalloc(sizeof(struct xt_af) * NFPROTO_NUMPROTO, GFP_KERNEL); if (!xt)
Epilogue due to master Jarek. Lockdep carest not about the locking doth bestowed. Therefore no keys are needed. Signed-off-by: Stephen Hemminger <shemminger@vyatta.com> --- net/netfilter/x_tables.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html