Commit 2816a096 authored Sep 08, 2023 by Luís Henriques Committed by Ilya Dryomov Sep 18, 2023

ceph: remove unnecessary check for NULL in parse_longname()



Function ceph_get_inode() never returns NULL; instead it returns an
ERR_PTR() if something fails.  Thus, the check for NULL in parse_longname()
is useless and can be dropped.  Instead, move there the debug code that
does the error checking so that it's only executed if ceph_get_inode() is
called.

Fixes: dd66df00 ("ceph: add support for encrypted snapshot names")
Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
Signed-off-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Xiubo Li <xiubli@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>

parent ce9ecca0

fs/ceph/crypto.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -249,11 +249,9 @@ static struct inode parse_longname(const struct inode parent,
	if (!dir) {		if (!dir) {
	/* This can happen if we're not mounting cephfs on the root */		/* This can happen if we're not mounting cephfs on the root */
	dir = ceph_get_inode(parent->i_sb, vino, NULL);		dir = ceph_get_inode(parent->i_sb, vino, NULL);
	if (!dir)
	dir = ERR_PTR(-ENOENT);
	}
	if (IS_ERR(dir))		if (IS_ERR(dir))
	dout("Can't find inode %s (%s)\n", inode_number, name);		dout("Can't find inode %s (%s)\n", inode_number, name);
			}

	out:		out:
	kfree(inode_number);		kfree(inode_number);