@@ -493,25 +493,29 @@ void
bnad_debugfs_init(struct bnad *bnad)
{
const struct bnad_debugfs_entry *file;
+ struct dentry *de;
char name[64];
int i;
/* Setup the BNA debugfs root directory*/
if (!bna_debugfs_root) {
- bna_debugfs_root = debugfs_create_dir("bna", NULL);
+ de = debugfs_create_dir("bna", NULL);
atomic_set(&bna_debugfs_port_count, 0);
- if (!bna_debugfs_root) {
+ if (IS_ERR(de)) {
netdev_warn(bnad->netdev,
"debugfs root dir creation failed\n");
return;
}
+ bna_debugfs_root = de;
}
/* Setup the pci_dev debugfs directory for the port */
snprintf(name, sizeof(name), "pci_dev:%s", pci_name(bnad->pcidev));
if (!bnad->port_debugfs_root) {
- bnad->port_debugfs_root =
- debugfs_create_dir(name, bna_debugfs_root);
+ de = debugfs_create_dir(name, bna_debugfs_root);
+ if (IS_ERR(de))
+ return;
+ bnad->port_debugfs_root = de;
atomic_inc(&bna_debugfs_port_count);
@@ -523,7 +527,7 @@ bnad_debugfs_init(struct bnad *bnad)
bnad->port_debugfs_root,
bnad,
file->fops);
- if (!bnad->bnad_dentry_files[i]) {
+ if (IS_ERR(bnad->bnad_dentry_files[i])) {
netdev_warn(bnad->netdev,
"create %s entry failed\n",
file->name);
Fix the incorrect return value check for debugfs_create_dir() and debugfs_create_file(), which returns ERR_PTR(-ERROR) instead of NULL when it fails. Commit 4ad23d2368cc ("bna: Remove error checking for debugfs_create_dir()") allows the program to continue execution if the creation of bnad->port_debugfs_root fails, which causes the atomic count bna_debugfs_port_count to be unbalanced. The corresponding error check need to be added back. Fixes: 4ad23d2368cc ("bna: Remove error checking for debugfs_create_dir()") Fixes: 7afc5dbde091 ("bna: Add debugfs interface.") Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com> --- drivers/net/ethernet/brocade/bna/bnad_debugfs.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)