| Message ID | 045996b9688bfaa2efbd8999405a67e23cd0a075.1306603968.git.joe@perches.com |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
David, Are you going to take this patch? it includes one chunck which is out of netfilter scope. Thanks. On 28/05/11 19:36, Joe Perches wrote: > Signed-off-by: Joe Perches <joe@perches.com> > --- > net/netfilter/x_tables.c | 5 ++--- > net/rds/ib_cm.c | 6 ++---- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c > index b0869fe..71441b9 100644 > --- a/net/netfilter/x_tables.c > +++ b/net/netfilter/x_tables.c > @@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i) > > size = sizeof(void **) * nr_cpu_ids; > if (size > PAGE_SIZE) > - i->jumpstack = vmalloc(size); > + i->jumpstack = vzalloc(size); > else > - i->jumpstack = kmalloc(size, GFP_KERNEL); > + i->jumpstack = kzalloc(size, GFP_KERNEL); > if (i->jumpstack == NULL) > return -ENOMEM; > - memset(i->jumpstack, 0, size); > > i->stacksize *= xt_jumpstack_multiplier; > size = sizeof(void *) * i->stacksize; > diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c > index fd453dd..6ecaf78 100644 > --- a/net/rds/ib_cm.c > +++ b/net/rds/ib_cm.c > @@ -374,23 +374,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn) > goto out; > } > > - ic->i_sends = vmalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), > + ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), > ibdev_to_node(dev)); > if (!ic->i_sends) { > ret = -ENOMEM; > rdsdebug("send allocation failed\n"); > goto out; > } > - memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work)); > > - ic->i_recvs = vmalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), > + ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), > ibdev_to_node(dev)); > if (!ic->i_recvs) { > ret = -ENOMEM; > rdsdebug("recv allocation failed\n"); > goto out; > } > - memset(ic->i_recvs, 0, ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work)); > > rds_ib_recv_init_ack(ic); > -- 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
From: Pablo Neira Ayuso <pablo@netfilter.org> Date: Thu, 02 Jun 2011 16:49:53 +0200 > Are you going to take this patch? it includes one chunck which is out of > netfilter scope. I think the trivial folks submit these things via their own tree and are only looking for ACKs from us. Acked-by: David S. Miller <davem@davemloft.net> -- 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
On Thu, 2011-06-02 at 14:39 -0700, David Miller wrote: > From: Pablo Neira Ayuso <pablo@netfilter.org> > Date: Thu, 02 Jun 2011 16:49:53 +0200 > > Are you going to take this patch? it includes one chunk which is out of > > netfilter scope. > I think the trivial folks submit these things via their own tree > and are only looking for ACKs from us. > Acked-by: David S. Miller <davem@davemloft.net> Getting trivial patches applied between the various maintainers and the trivial tree is most often a bit uncoordinated and haphazard. Doing micropatches for each subsystem maintainer does sometimes appear to be detrimental to getting any treewide modification applied. I've experimented with both micropatches and treewide patches to gauge what happens. I'm not sure either approach is better or worse. In any case, it commonly takes several submittals for these sort of trivial patches to get applied either by the subtree maintainer or by Jiri. Jiri often waits a few weeks for patches to get picked up by any subtree maintainer before looking at his trivial emails. Sometimes he acks what's left, sometimes what's left just disappears into the ethervoid waiting for the submitter to try again. No worries, that's just the way it is. -- 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
On 02/06/11 23:39, David Miller wrote: > From: Pablo Neira Ayuso <pablo@netfilter.org> > Date: Thu, 02 Jun 2011 16:49:53 +0200 > >> Are you going to take this patch? it includes one chunck which is out of >> netfilter scope. > > I think the trivial folks submit these things via their own tree > and are only looking for ACKs from us. > > Acked-by: David S. Miller <davem@davemloft.net> Acked-by: Pablo Neira Ayuso <pablo@netfilter.org> -- 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
diff --git a/net/netfilter/x_tables.c b/net/netfilter/x_tables.c index b0869fe..71441b9 100644 --- a/net/netfilter/x_tables.c +++ b/net/netfilter/x_tables.c @@ -776,12 +776,11 @@ static int xt_jumpstack_alloc(struct xt_table_info *i) size = sizeof(void **) * nr_cpu_ids; if (size > PAGE_SIZE) - i->jumpstack = vmalloc(size); + i->jumpstack = vzalloc(size); else - i->jumpstack = kmalloc(size, GFP_KERNEL); + i->jumpstack = kzalloc(size, GFP_KERNEL); if (i->jumpstack == NULL) return -ENOMEM; - memset(i->jumpstack, 0, size); i->stacksize *= xt_jumpstack_multiplier; size = sizeof(void *) * i->stacksize; diff --git a/net/rds/ib_cm.c b/net/rds/ib_cm.c index fd453dd..6ecaf78 100644 --- a/net/rds/ib_cm.c +++ b/net/rds/ib_cm.c @@ -374,23 +374,21 @@ static int rds_ib_setup_qp(struct rds_connection *conn) goto out; } - ic->i_sends = vmalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), + ic->i_sends = vzalloc_node(ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work), ibdev_to_node(dev)); if (!ic->i_sends) { ret = -ENOMEM; rdsdebug("send allocation failed\n"); goto out; } - memset(ic->i_sends, 0, ic->i_send_ring.w_nr * sizeof(struct rds_ib_send_work)); - ic->i_recvs = vmalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), + ic->i_recvs = vzalloc_node(ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work), ibdev_to_node(dev)); if (!ic->i_recvs) { ret = -ENOMEM; rdsdebug("recv allocation failed\n"); goto out; } - memset(ic->i_recvs, 0, ic->i_recv_ring.w_nr * sizeof(struct rds_ib_recv_work)); rds_ib_recv_init_ack(ic);
Signed-off-by: Joe Perches <joe@perches.com> --- net/netfilter/x_tables.c | 5 ++--- net/rds/ib_cm.c | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-)