Commit 06708adb authored by Al Viro's avatar Al Viro
Browse files

merging pick_link() with get_link(), part 6 



move the only remaining call of get_link() into pick_link()

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

fs/namei.c

+5 −8
Original line number Diff line number Diff line
@@ -1793,14 +1793,14 @@ static inline int handle_dots(struct nameidata *nd, int type) 
	return 0;

}



static int pick_link(struct nameidata *nd, struct path *link,

static const char *pick_link(struct nameidata *nd, struct path *link,

		     struct inode *inode, unsigned seq)

{

	int error;

	struct saved *last;

	if (unlikely(nd->total_link_count++ >= MAXSYMLINKS)) {

		path_to_nameidata(link, nd);

		return -ELOOP;

		return ERR_PTR(-ELOOP);

	}

	if (!(nd->flags & LOOKUP_RCU)) {

		if (link->mnt == nd->path.mnt)
@@ -1821,7 +1821,7 @@ static int pick_link(struct nameidata *nd, struct path *link, 
		}

		if (error) {

			path_put(link);

			return error;

			return ERR_PTR(error);

		}

	}
@@ -1830,7 +1830,7 @@ static int pick_link(struct nameidata *nd, struct path *link, 
	clear_delayed_call(&last->done);

	nd->link_inode = inode;

	last->seq = seq;

	return 1;

	return get_link(nd);

}



enum {WALK_FOLLOW = 1, WALK_MORE = 2, WALK_NOFOLLOW = 4};
@@ -1863,10 +1863,7 @@ static const char *step_into(struct nameidata *nd, int flags, 
		if (read_seqcount_retry(&path.dentry->d_seq, seq))

			return ERR_PTR(-ECHILD);

	}

	err = pick_link(nd, &path, inode, seq);

	if (err > 0)

		return get_link(nd);

	return ERR_PTR(err);

	return pick_link(nd, &path, inode, seq);

}



static const char *walk_component(struct nameidata *nd, int flags)