Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bcacd1e authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman Committed by Simon Wunderlich
Browse files

batman-adv: no need to check return value of debugfs_create functions 



When calling debugfs functions, there is no need to ever check the
return value.  The function can work or not, but the code logic should
never do something different based on this.

Because we don't care if debugfs works or not, this trickles back a bit
so we can clean things up by making some functions return void instead
of an error value that is never going to fail.

Cc: Marek Lindner <mareklindner@neomailbox.ch>
Cc: Simon Wunderlich <sw@simonwunderlich.de>
Cc: Antonio Quartulli <a@unstable.cc>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: b.a.t.m.a.n@lists.open-mesh.org
Cc: netdev@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
[sven@narfation.org: drop unused variables]
Signed-off-by: default avatarSven Eckelmann <sven@narfation.org>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
parent 390dcd48

net/batman-adv/debugfs.c

+20 −79
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ 
#include <asm/current.h>

#include <linux/dcache.h>

#include <linux/debugfs.h>

#include <linux/err.h>

#include <linux/errno.h>

#include <linux/export.h>

#include <linux/fs.h>
@@ -293,31 +292,13 @@ static struct batadv_debuginfo *batadv_hardif_debuginfos[] = { 
void batadv_debugfs_init(void)

{

	struct batadv_debuginfo **bat_debug;

	struct dentry *file;



	batadv_debugfs = debugfs_create_dir(BATADV_DEBUGFS_SUBDIR, NULL);

	if (batadv_debugfs == ERR_PTR(-ENODEV))

		batadv_debugfs = NULL;



	if (!batadv_debugfs)

		goto err;



	for (bat_debug = batadv_general_debuginfos; *bat_debug; ++bat_debug) {

		file = debugfs_create_file(((*bat_debug)->attr).name,

	for (bat_debug = batadv_general_debuginfos; *bat_debug; ++bat_debug)

		debugfs_create_file(((*bat_debug)->attr).name,

				    S_IFREG | ((*bat_debug)->attr).mode,

					   batadv_debugfs, NULL,

					   &(*bat_debug)->fops);

		if (!file) {

			pr_err("Can't add general debugfs file: %s\n",

			       ((*bat_debug)->attr).name);

			goto err;

		}

	}



	return;

err:

	debugfs_remove_recursive(batadv_debugfs);

	batadv_debugfs = NULL;

				    batadv_debugfs, NULL, &(*bat_debug)->fops);

}



/**
@@ -333,42 +314,23 @@ void batadv_debugfs_destroy(void) 
 * batadv_debugfs_add_hardif() - creates the base directory for a hard interface

 *  in debugfs.

 * @hard_iface: hard interface which should be added.

 *

 * Return: 0 on success or negative error number in case of failure

 */

int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)

void batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)

{

	struct net *net = dev_net(hard_iface->net_dev);

	struct batadv_debuginfo **bat_debug;

	struct dentry *file;



	if (!batadv_debugfs)

		goto out;



	if (net != &init_net)

		return 0;

		return;



	hard_iface->debug_dir = debugfs_create_dir(hard_iface->net_dev->name,

						   batadv_debugfs);

	if (!hard_iface->debug_dir)

		goto out;



	for (bat_debug = batadv_hardif_debuginfos; *bat_debug; ++bat_debug) {

		file = debugfs_create_file(((*bat_debug)->attr).name,

	for (bat_debug = batadv_hardif_debuginfos; *bat_debug; ++bat_debug)

		debugfs_create_file(((*bat_debug)->attr).name,

				    S_IFREG | ((*bat_debug)->attr).mode,

					   hard_iface->debug_dir,

					   hard_iface->net_dev,

				    hard_iface->debug_dir, hard_iface->net_dev,

				    &(*bat_debug)->fops);

		if (!file)

			goto rem_attr;

	}



	return 0;

rem_attr:

	debugfs_remove_recursive(hard_iface->debug_dir);

	hard_iface->debug_dir = NULL;

out:

	return -ENOMEM;

}



/**
@@ -379,15 +341,12 @@ void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface) 
{

	const char *name = hard_iface->net_dev->name;

	struct dentry *dir;

	struct dentry *d;



	dir = hard_iface->debug_dir;

	if (!dir)

		return;



	d = debugfs_rename(dir->d_parent, dir, dir->d_parent, name);

	if (!d)

		pr_err("Can't rename debugfs dir to %s\n", name);

	debugfs_rename(dir->d_parent, dir, dir->d_parent, name);

}



/**
@@ -419,44 +378,29 @@ int batadv_debugfs_add_meshif(struct net_device *dev) 
	struct batadv_priv *bat_priv = netdev_priv(dev);

	struct batadv_debuginfo **bat_debug;

	struct net *net = dev_net(dev);

	struct dentry *file;



	if (!batadv_debugfs)

		goto out;



	if (net != &init_net)

		return 0;



	bat_priv->debug_dir = debugfs_create_dir(dev->name, batadv_debugfs);

	if (!bat_priv->debug_dir)

		goto out;



	if (batadv_socket_setup(bat_priv) < 0)

		goto rem_attr;

	batadv_socket_setup(bat_priv);



	if (batadv_debug_log_setup(bat_priv) < 0)

		goto rem_attr;



	for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug) {

		file = debugfs_create_file(((*bat_debug)->attr).name,

	for (bat_debug = batadv_mesh_debuginfos; *bat_debug; ++bat_debug)

		debugfs_create_file(((*bat_debug)->attr).name,

				    S_IFREG | ((*bat_debug)->attr).mode,

					   bat_priv->debug_dir,

					   dev, &(*bat_debug)->fops);

		if (!file) {

			batadv_err(dev, "Can't add debugfs file: %s/%s\n",

				   dev->name, ((*bat_debug)->attr).name);

			goto rem_attr;

		}

	}

				    bat_priv->debug_dir, dev,

				    &(*bat_debug)->fops);



	if (batadv_nc_init_debugfs(bat_priv) < 0)

		goto rem_attr;

	batadv_nc_init_debugfs(bat_priv);



	return 0;

rem_attr:

	debugfs_remove_recursive(bat_priv->debug_dir);

	bat_priv->debug_dir = NULL;

out:

	return -ENOMEM;

}
@@ -469,15 +413,12 @@ void batadv_debugfs_rename_meshif(struct net_device *dev) 
	struct batadv_priv *bat_priv = netdev_priv(dev);

	const char *name = dev->name;

	struct dentry *dir;

	struct dentry *d;



	dir = bat_priv->debug_dir;

	if (!dir)

		return;



	d = debugfs_rename(dir->d_parent, dir, dir->d_parent, name);

	if (!d)

		pr_err("Can't rename debugfs dir to %s\n", name);

	debugfs_rename(dir->d_parent, dir, dir->d_parent, name);

}



/**

net/batman-adv/debugfs.h

+2 −3
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ void batadv_debugfs_destroy(void); 
int batadv_debugfs_add_meshif(struct net_device *dev);

void batadv_debugfs_rename_meshif(struct net_device *dev);

void batadv_debugfs_del_meshif(struct net_device *dev);

int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface);

void batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface);

void batadv_debugfs_rename_hardif(struct batadv_hard_iface *hard_iface);

void batadv_debugfs_del_hardif(struct batadv_hard_iface *hard_iface);
@@ -54,9 +54,8 @@ static inline void batadv_debugfs_del_meshif(struct net_device *dev) 
}



static inline

int batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)

void batadv_debugfs_add_hardif(struct batadv_hard_iface *hard_iface)

{

	return 0;

}



static inline

net/batman-adv/hard-interface.c

+1 −5
Original line number Diff line number Diff line
@@ -921,9 +921,7 @@ batadv_hardif_add_interface(struct net_device *net_dev) 
	hard_iface->soft_iface = NULL;

	hard_iface->if_status = BATADV_IF_NOT_IN_USE;



	ret = batadv_debugfs_add_hardif(hard_iface);

	if (ret)

		goto free_sysfs;

	batadv_debugfs_add_hardif(hard_iface);



	INIT_LIST_HEAD(&hard_iface->list);

	INIT_HLIST_HEAD(&hard_iface->neigh_list);
@@ -945,8 +943,6 @@ batadv_hardif_add_interface(struct net_device *net_dev) 


	return hard_iface;



free_sysfs:

	batadv_sysfs_del_hardif(&hard_iface->hardif_obj);

free_if:

	kfree(hard_iface);

release_dev:

net/batman-adv/icmp_socket.c

+3 −17
Original line number Diff line number Diff line
@@ -314,25 +314,11 @@ static const struct file_operations batadv_fops = { 
/**

 * batadv_socket_setup() - Create debugfs "socket" file

 * @bat_priv: the bat priv with all the soft interface information

 *

 * Return: 0 on success or negative error number in case of failure

 */

int batadv_socket_setup(struct batadv_priv *bat_priv)

void batadv_socket_setup(struct batadv_priv *bat_priv)

{

	struct dentry *d;



	if (!bat_priv->debug_dir)

		goto err;



	d = debugfs_create_file(BATADV_ICMP_SOCKET, 0600, bat_priv->debug_dir,

	debugfs_create_file(BATADV_ICMP_SOCKET, 0600, bat_priv->debug_dir,

			    bat_priv, &batadv_fops);

	if (!d)

		goto err;



	return 0;



err:

	return -ENOMEM;

}



/**

net/batman-adv/icmp_socket.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#define BATADV_ICMP_SOCKET "socket"



int batadv_socket_setup(struct batadv_priv *bat_priv);

void batadv_socket_setup(struct batadv_priv *bat_priv);



#ifdef CONFIG_BATMAN_ADV_DEBUGFS