Commit 6920a440 authored by Al Viro's avatar Al Viro
Browse files

namei: simplify failure exits in get_link() 



when cookie is NULL, put_link() is equivalent to path_put(), so
as soon as we'd set last->cookie to NULL, we can bump nd->depth and
let the normal logics in terminate_walk() to take care of cleanups.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 6e77137b

fs/namei.c

+4 −8
Original line number Diff line number Diff line
@@ -904,27 +904,23 @@ const char *get_link(struct nameidata *nd) 


	last->link = nd->link;

	last->cookie = NULL;

	nd->depth++;



	cond_resched();



	touch_atime(&last->link);



	error = security_inode_follow_link(dentry);

	res = ERR_PTR(error);

	if (error)

		goto out;

		return ERR_PTR(error);



	nd->last_type = LAST_BIND;

	res = inode->i_link;

	if (!res) {

		res = inode->i_op->follow_link(dentry, &last->cookie);

		if (IS_ERR(res)) {

out:

			path_put(&last->link);

			return res;

		}

		if (IS_ERR_OR_NULL(res))

			last->cookie = NULL;

	}

	nd->depth++;

	return res;

}