diff options
| author |   Arnaldo Carvalho de Melo <acme@mandriva.com> | 2006-11-21 01:17:18 -0200 |
|---|---|---|
| committer |   David S. Miller <davem@sunset.davemloft.net> | 2006-12-02 21:30:16 -0800 |
| commit | 8b2ed4bba45b7ca8e378d45f82f3f32f651e0a42 (patch) | |
| tree | 1a75381b931b5d02f01d91b3b8d5051de9d833a4 | |
| parent | [DECNET]: Use kzalloc where applicable (diff) | |
| download | linux-dev-8b2ed4bba45b7ca8e378d45f82f3f32f651e0a42.tar.xz linux-dev-8b2ed4bba45b7ca8e378d45f82f3f32f651e0a42.zip | |
[IPVS]: Use kmemdup where appropriate
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_app.c | 3 | ||||
| -rw-r--r-- | net/ipv4/ipvs/ip_vs_proto.c | 8 |
2 files changed, 2 insertions, 9 deletions
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c index e7752334d296..6c40899aa161 100644 --- a/net/ipv4/ipvs/ip_vs_app.c +++ b/net/ipv4/ipvs/ip_vs_app.c @@ -80,10 +80,9 @@ ip_vs_app_inc_new(struct ip_vs_app *app, __u16 proto, __u16 port) if (!pp->unregister_app) return -EOPNOTSUPP; - inc = kmalloc(sizeof(struct ip_vs_app), GFP_KERNEL); + inc = kmemdup(app, sizeof(*inc), GFP_KERNEL); if (!inc) return -ENOMEM; - memcpy(inc, app, sizeof(*inc)); INIT_LIST_HEAD(&inc->p_list); INIT_LIST_HEAD(&inc->incs_list); inc->app = app; diff --git a/net/ipv4/ipvs/ip_vs_proto.c b/net/ipv4/ipvs/ip_vs_proto.c index c4528b5c800d..e844ddb82b9a 100644 --- a/net/ipv4/ipvs/ip_vs_proto.c +++ b/net/ipv4/ipvs/ip_vs_proto.c @@ -118,13 +118,7 @@ void ip_vs_protocol_timeout_change(int flags) int * ip_vs_create_timeout_table(int *table, int size) { - int *t; - - t = kmalloc(size, GFP_ATOMIC); - if (t == NULL) - return NULL; - memcpy(t, table, size); - return t; + return kmemdup(table, size, GFP_ATOMIC); } |