| Message ID | 20230719020822.541-1-machel@vivo.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v4] bonding: Fix error checking for debugfs_create_dir() | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Clearly marked for net |
| netdev/apply | fail | Patch does not apply to net |
On Wed, 2023-07-19 at 02:10 +0000, 王明-软件底层技术部 wrote: > The debugfs_create_dir() function returns error pointers, > it never returns NULL. Most incorrect error checks were fixed, > but the one in bond_create_debugfs() was forgotten. > > Fixes: f073c7ca29a4 ("bonding: add the debugfs facility to the bonding driver") > Signed-off-by: Wang Ming <machel@vivo.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 594094526648..d4a82f276e87 100644 > --- a/drivers/net/bonding/bond_debugfs.c > +++ b/drivers/net/bonding/bond_debugfs.c > @@ -88,7 +88,7 @@ void bond_create_debugfs(void) > { > bonding_debug_root = debugfs_create_dir("bonding", NULL); > > - if (!bonding_debug_root) > + if (IS_ERR(bonding_debug_root)) > pr_warn("Warning: Cannot create bonding directory in debugfs\n"); > } > Does not apply cleanly to -net. To be more accurate, the patch is base64 encoded and git is quite unhappy to decode it. Possibly your mail server is doing something funny in between?!? Please solve the above before reposting. /P
Paolo Abeni <pabeni@redhat.com> wrote: >On Wed, 2023-07-19 at 02:10 +0000, 王明-软件底层技术部 wrote: >> The debugfs_create_dir() function returns error pointers, >> it never returns NULL. Most incorrect error checks were fixed, >> but the one in bond_create_debugfs() was forgotten. >> >> Fixes: f073c7ca29a4 ("bonding: add the debugfs facility to the bonding driver") >> Signed-off-by: Wang Ming <machel@vivo.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 594094526648..d4a82f276e87 100644 >> --- a/drivers/net/bonding/bond_debugfs.c >> +++ b/drivers/net/bonding/bond_debugfs.c >> @@ -88,7 +88,7 @@ void bond_create_debugfs(void) >> { >> bonding_debug_root = debugfs_create_dir("bonding", NULL); >> >> - if (!bonding_debug_root) >> + if (IS_ERR(bonding_debug_root)) >> pr_warn("Warning: Cannot create bonding directory in debugfs\n"); >> } >> > >Does not apply cleanly to -net. To be more accurate, the patch is >base64 encoded and git is quite unhappy to decode it. > >Possibly your mail server is doing something funny in between?!? > >Please solve the above before reposting. It appears to have trailing carriage returns on every line after base64 decoding, i.e., $ git am /tmp/test.patch [ this fails ] $ git am --show-current-patch=diff > /tmp/patch2 $ cat -v /tmp/patch2 ---^M drivers/net/bonding/bond_debugfs.c | 2 +-^M 1 file changed, 1 insertion(+), 1 deletion(-)^M ^M diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c^M index 594094526648..d4a82f276e87 100644^M --- a/drivers/net/bonding/bond_debugfs.c^M +++ b/drivers/net/bonding/bond_debugfs.c^M @@ -88,7 +88,7 @@ void bond_create_debugfs(void)^M [...] -J --- -Jay Vosburgh, jay.vosburgh@canonical.com
On 19/07/2023 5:10, 王明-软件底层技术部 wrote: > The debugfs_create_dir() function returns error pointers, > it never returns NULL. Most incorrect error checks were fixed, > but the one in bond_create_debugfs() was forgotten. > > Fixes: f073c7ca29a4 ("bonding: add the debugfs facility to the bonding driver") > Signed-off-by: Wang Ming <machel@vivo.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 594094526648..d4a82f276e87 100644 > --- a/drivers/net/bonding/bond_debugfs.c > +++ b/drivers/net/bonding/bond_debugfs.c > @@ -88,7 +88,7 @@ void bond_create_debugfs(void) > { > bonding_debug_root = debugfs_create_dir("bonding", NULL); > > - if (!bonding_debug_root) > + if (IS_ERR(bonding_debug_root)) > pr_warn("Warning: Cannot create bonding directory in debugfs\n"); > } > Reviewed-by: Tariq Toukan <tariqt@nvidia.com> Thanks.
diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c index 594094526648..d4a82f276e87 100644 --- a/drivers/net/bonding/bond_debugfs.c +++ b/drivers/net/bonding/bond_debugfs.c @@ -88,7 +88,7 @@ void bond_create_debugfs(void) { bonding_debug_root = debugfs_create_dir("bonding", NULL); - if (!bonding_debug_root) + if (IS_ERR(bonding_debug_root)) pr_warn("Warning: Cannot create bonding directory in debugfs\n"); }
The debugfs_create_dir() function returns error pointers, it never returns NULL. Most incorrect error checks were fixed, but the one in bond_create_debugfs() was forgotten. Fixes: f073c7ca29a4 ("bonding: add the debugfs facility to the bonding driver") Signed-off-by: Wang Ming <machel@vivo.com> --- drivers/net/bonding/bond_debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)