Skip to content

Commit

Permalink
batman-adv: Remove unnecessary OOM logging messages
Browse files Browse the repository at this point in the history
Removing unnecessary messages saves code and text.

Site specific OOM messages are duplications of a generic MM
out of memory message and aren't really useful, so just
delete them.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
  • Loading branch information
Joe Perches authored and Marek Lindner committed Sep 8, 2011
1 parent 45485ad commit 320f422
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 24 deletions.
5 changes: 1 addition & 4 deletions net/batman-adv/hard-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -434,11 +434,8 @@ static struct hard_iface *hardif_add_interface(struct net_device *net_dev)
dev_hold(net_dev);

hard_iface = kmalloc(sizeof(*hard_iface), GFP_ATOMIC);
if (!hard_iface) {
pr_err("Can't add interface (%s): out of memory\n",
net_dev->name);
if (!hard_iface)
goto release_dev;
}

ret = sysfs_add_hardif(&hard_iface->hardif_obj, net_dev);
if (ret)
Expand Down
2 changes: 0 additions & 2 deletions net/batman-adv/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,6 @@ int mesh_init(struct net_device *soft_iface)
goto end;

err:
pr_err("Unable to allocate memory for mesh information structures: "
"out of mem ?\n");
mesh_free(soft_iface);
return -1;

Expand Down
16 changes: 4 additions & 12 deletions net/batman-adv/originator.c
Original file line number Diff line number Diff line change
Expand Up @@ -492,21 +492,17 @@ static int orig_node_add_if(struct orig_node *orig_node, int max_if_num)

data_ptr = kmalloc(max_if_num * sizeof(unsigned long) * NUM_WORDS,
GFP_ATOMIC);
if (!data_ptr) {
pr_err("Can't resize orig: out of memory\n");
if (!data_ptr)
return -1;
}

memcpy(data_ptr, orig_node->bcast_own,
(max_if_num - 1) * sizeof(unsigned long) * NUM_WORDS);
kfree(orig_node->bcast_own);
orig_node->bcast_own = data_ptr;

data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
if (!data_ptr) {
pr_err("Can't resize orig: out of memory\n");
if (!data_ptr)
return -1;
}

memcpy(data_ptr, orig_node->bcast_own_sum,
(max_if_num - 1) * sizeof(uint8_t));
Expand Down Expand Up @@ -561,10 +557,8 @@ static int orig_node_del_if(struct orig_node *orig_node,

chunk_size = sizeof(unsigned long) * NUM_WORDS;
data_ptr = kmalloc(max_if_num * chunk_size, GFP_ATOMIC);
if (!data_ptr) {
pr_err("Can't resize orig: out of memory\n");
if (!data_ptr)
return -1;
}

/* copy first part */
memcpy(data_ptr, orig_node->bcast_own, del_if_num * chunk_size);
Expand All @@ -582,10 +576,8 @@ static int orig_node_del_if(struct orig_node *orig_node,
goto free_own_sum;

data_ptr = kmalloc(max_if_num * sizeof(uint8_t), GFP_ATOMIC);
if (!data_ptr) {
pr_err("Can't resize orig: out of memory\n");
if (!data_ptr)
return -1;
}

memcpy(data_ptr, orig_node->bcast_own_sum,
del_if_num * sizeof(uint8_t));
Expand Down
4 changes: 1 addition & 3 deletions net/batman-adv/soft-interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -801,10 +801,8 @@ struct net_device *softif_create(const char *name)

soft_iface = alloc_netdev(sizeof(*bat_priv), name, interface_setup);

if (!soft_iface) {
pr_err("Unable to allocate the batman interface: %s\n", name);
if (!soft_iface)
goto out;
}

ret = register_netdevice(soft_iface);
if (ret < 0) {
Expand Down
4 changes: 1 addition & 3 deletions net/batman-adv/vis.c
Original file line number Diff line number Diff line change
Expand Up @@ -887,10 +887,8 @@ int vis_init(struct bat_priv *bat_priv)
}

bat_priv->my_vis_info = kmalloc(MAX_VIS_PACKET_SIZE, GFP_ATOMIC);
if (!bat_priv->my_vis_info) {
pr_err("Can't initialize vis packet\n");
if (!bat_priv->my_vis_info)
goto err;
}

bat_priv->my_vis_info->skb_packet = dev_alloc_skb(sizeof(*packet) +
MAX_VIS_PACKET_SIZE +
Expand Down

0 comments on commit 320f422

Please sign in to comment.