| Message ID | 20230929091206.13955-1-lhenriques@suse.de |
|---|---|
| State | New |
| Headers | show |
| Series | ceph: remove unnecessary IS_ERR() check in ceph_fname_to_usr() | expand |
On Fri, Sep 29, 2023 at 11:12 AM Luis Henriques <lhenriques@suse.de> wrote: > > Before returning, function ceph_fname_to_usr() does a final IS_ERR() check > in 'dir': > > if ((dir != fname->dir) && !IS_ERR(dir)) {...} > > This check is unnecessary because, if the 'dir' variable has changed to > something other than 'fname->dir' (it's initial value), that error check has > been performed already and, if there was indeed an error, it would have > been returned immediately. > > Besides, this useless IS_ERR() is also confusing static analysis tools. > > Reported-by: kernel test robot <lkp@intel.com> > Reported-by: Dan Carpenter <dan.carpenter@linaro.org> > Closes: https://lore.kernel.org/r/202309282202.xZxGdvS3-lkp@intel.com/ > Signed-off-by: Luis Henriques <lhenriques@suse.de> > --- > fs/ceph/crypto.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c > index e4d5cd56a80b..e19019209cf0 100644 > --- a/fs/ceph/crypto.c > +++ b/fs/ceph/crypto.c > @@ -462,7 +462,7 @@ int ceph_fname_to_usr(const struct ceph_fname *fname, struct fscrypt_str *tname, > out: > fscrypt_fname_free_buffer(&_tname); > out_inode: > - if ((dir != fname->dir) && !IS_ERR(dir)) { > + if (dir != fname->dir) { > if ((dir->i_state & I_NEW)) > discard_new_inode(dir); > else Applied. Thanks, Ilya
diff --git a/fs/ceph/crypto.c b/fs/ceph/crypto.c index e4d5cd56a80b..e19019209cf0 100644 --- a/fs/ceph/crypto.c +++ b/fs/ceph/crypto.c @@ -462,7 +462,7 @@ int ceph_fname_to_usr(const struct ceph_fname *fname, struct fscrypt_str *tname, out: fscrypt_fname_free_buffer(&_tname); out_inode: - if ((dir != fname->dir) && !IS_ERR(dir)) { + if (dir != fname->dir) { if ((dir->i_state & I_NEW)) discard_new_inode(dir); else
Before returning, function ceph_fname_to_usr() does a final IS_ERR() check in 'dir': if ((dir != fname->dir) && !IS_ERR(dir)) {...} This check is unnecessary because, if the 'dir' variable has changed to something other than 'fname->dir' (it's initial value), that error check has been performed already and, if there was indeed an error, it would have been returned immediately. Besides, this useless IS_ERR() is also confusing static analysis tools. Reported-by: kernel test robot <lkp@intel.com> Reported-by: Dan Carpenter <dan.carpenter@linaro.org> Closes: https://lore.kernel.org/r/202309282202.xZxGdvS3-lkp@intel.com/ Signed-off-by: Luis Henriques <lhenriques@suse.de> --- fs/ceph/crypto.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)