Commit 42b71826 authored by Luis Henriques's avatar Luis Henriques Committed by Ilya Dryomov
Browse files

ceph: remove unnecessary IS_ERR() check in ceph_fname_to_usr() 



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: default avatarkernel test robot <lkp@intel.com>
Reported-by: default avatarDan Carpenter <dan.carpenter@linaro.org>
Closes: https://lore.kernel.org/r/202309282202.xZxGdvS3-lkp@intel.com/


Signed-off-by: default avatarLuis Henriques <lhenriques@suse.de>
Reviewed-by: default avatarIlya Dryomov <idryomov@gmail.com>
Signed-off-by: default avatarIlya Dryomov <idryomov@gmail.com>
parent 15c0a870

fs/ceph/crypto.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,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