korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-13 14:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

merging pick_link() with get_link(), part 6

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

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-01-14 14:26:57 -05:00
parent b0417d2c72
commit 06708adb99
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fs/namei.c
View File

@ -1793,14 +1793,14 @@ static inline int handle_dots(struct nameidata *nd, int type)
return 0; 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) struct inode *inode, unsigned seq)
{ {
int error; int error;
struct saved *last; struct saved *last;
if (unlikely(nd->total_link_count++ >= MAXSYMLINKS)) { if (unlikely(nd->total_link_count++ >= MAXSYMLINKS)) {
path_to_nameidata(link, nd); path_to_nameidata(link, nd);
return -ELOOP; return ERR_PTR(-ELOOP);
} }
if (!(nd->flags & LOOKUP_RCU)) { if (!(nd->flags & LOOKUP_RCU)) {
if (link->mnt == nd->path.mnt) if (link->mnt == nd->path.mnt)
@ -1821,7 +1821,7 @@ static int pick_link(struct nameidata *nd, struct path *link,
} }
if (error) { if (error) {
path_put(link); 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); clear_delayed_call(&last->done);
nd->link_inode = inode; nd->link_inode = inode;
last->seq = seq; last->seq = seq;
return 1; return get_link(nd);
} }
enum {WALK_FOLLOW = 1, WALK_MORE = 2, WALK_NOFOLLOW = 4}; 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)) if (read_seqcount_retry(&path.dentry->d_seq, seq))
return ERR_PTR(-ECHILD); return ERR_PTR(-ECHILD);
} }
err = pick_link(nd, &path, inode, seq); return pick_link(nd, &path, inode, seq);
if (err > 0)
return get_link(nd);
return ERR_PTR(err);
} }
static const char *walk_component(struct nameidata *nd, int flags) static const char *walk_component(struct nameidata *nd, int flags)