Commit dc7af8dc authored by Al Viro's avatar Al Viro
Browse files

link_path_walk: nd->depth massage, part 9 



Make link_path_walk() work with any value of nd->depth on entry -
memorize it and use it in tests instead of comparing with 1.
Don't bother with increment/decrement in path_init().

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

fs/namei.c

+4 −6
Original line number Diff line number Diff line
@@ -1759,6 +1759,7 @@ static inline u64 hash_name(const char *name) 
static int link_path_walk(const char *name, struct nameidata *nd)

{

	int err;

	int orig_depth = nd->depth;



	while (*name=='/')

		name++;
@@ -1867,11 +1868,11 @@ Walked: 
	}

	terminate_walk(nd);

Err:

	while (unlikely(nd->depth > 1))

	while (unlikely(nd->depth > orig_depth))

		put_link(nd);

	return err;

OK:

	if (unlikely(nd->depth > 1)) {

	if (unlikely(nd->depth > orig_depth)) {

		name = nd->stack[nd->depth - 1].name;

		err = walk_component(nd, LOOKUP_FOLLOW);

		put_link(nd);
@@ -1979,10 +1980,7 @@ static int path_init(int dfd, const struct filename *name, unsigned int flags, 
	return -ECHILD;

done:

	current->total_link_count = 0;

	nd->depth++;

	retval = link_path_walk(s, nd);

	nd->depth--;

	return retval;

	return link_path_walk(s, nd);

}



static void path_cleanup(struct nameidata *nd)

CRA Git | Maintained and supported by SUSTech CRA and CCSE