| Message ID | 20230202093256.32458-3-zhengqi.arch@bytedance.com |
|---|---|
| State | Accepted |
| Commit | cbe83191d40d8925b7a99969d037d2a0caf69294 |
| Headers | show |
| Series | some minor fixes of error checking about debugfs_rename() | expand |
Qi Zheng <zhengqi.arch@bytedance.com> wrote: >Since commit ff9fb72bc077 ("debugfs: return error values, >not NULL") changed return value of debugfs_rename() in >error cases from %NULL to %ERR_PTR(-ERROR), we should >also check error values instead of NULL. > >Fixes: ff9fb72bc077 ("debugfs: return error values, not NULL") >Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com> >--- > drivers/net/bonding/bond_debugfs.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > >diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c >index 4f9b4a18c74c..594094526648 100644 >--- a/drivers/net/bonding/bond_debugfs.c >+++ b/drivers/net/bonding/bond_debugfs.c >@@ -76,7 +76,7 @@ void bond_debug_reregister(struct bonding *bond) > > d = debugfs_rename(bonding_debug_root, bond->debug_dir, > bonding_debug_root, bond->dev->name); >- if (d) { >+ if (!IS_ERR(d)) { > bond->debug_dir = d; > } else { > netdev_warn(bond->dev, "failed to reregister, so just unregister old one\n"); >-- >2.20.1 >
diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c index 4f9b4a18c74c..594094526648 100644 --- a/drivers/net/bonding/bond_debugfs.c +++ b/drivers/net/bonding/bond_debugfs.c @@ -76,7 +76,7 @@ void bond_debug_reregister(struct bonding *bond) d = debugfs_rename(bonding_debug_root, bond->debug_dir, bonding_debug_root, bond->dev->name); - if (d) { + if (!IS_ERR(d)) { bond->debug_dir = d; } else { netdev_warn(bond->dev, "failed to reregister, so just unregister old one\n");
Since commit ff9fb72bc077 ("debugfs: return error values, not NULL") changed return value of debugfs_rename() in error cases from %NULL to %ERR_PTR(-ERROR), we should also check error values instead of NULL. Fixes: ff9fb72bc077 ("debugfs: return error values, not NULL") Signed-off-by: Qi Zheng <zhengqi.arch@bytedance.com> --- drivers/net/bonding/bond_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)