Commit 8402752e authored by Al Viro's avatar Al Viro

namei: simplify the callers of follow_managed()

now that it gets nameidata, no reason to have setting LOOKUP_JUMPED on
mountpoint crossing and calling path_put_conditional() on failures
done in every caller.
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 756daf26
...@@ -1118,7 +1118,11 @@ static int follow_managed(struct path *path, struct nameidata *nd) ...@@ -1118,7 +1118,11 @@ static int follow_managed(struct path *path, struct nameidata *nd)
mntput(path->mnt); mntput(path->mnt);
if (ret == -EISDIR) if (ret == -EISDIR)
ret = 0; ret = 0;
return ret < 0 ? ret : need_mntput; if (need_mntput)
nd->flags |= LOOKUP_JUMPED;
if (unlikely(ret < 0))
path_put_conditional(path, nd);
return ret;
} }
int follow_down_one(struct path *path) int follow_down_one(struct path *path)
...@@ -1494,14 +1498,9 @@ static int lookup_fast(struct nameidata *nd, ...@@ -1494,14 +1498,9 @@ static int lookup_fast(struct nameidata *nd,
path->mnt = mnt; path->mnt = mnt;
path->dentry = dentry; path->dentry = dentry;
err = follow_managed(path, nd); err = follow_managed(path, nd);
if (unlikely(err < 0)) { if (likely(!err))
path_put_conditional(path, nd); *inode = path->dentry->d_inode;
return err; return err;
}
if (err)
nd->flags |= LOOKUP_JUMPED;
*inode = path->dentry->d_inode;
return 0;
need_lookup: need_lookup:
return 1; return 1;
...@@ -1511,7 +1510,6 @@ static int lookup_fast(struct nameidata *nd, ...@@ -1511,7 +1510,6 @@ static int lookup_fast(struct nameidata *nd,
static int lookup_slow(struct nameidata *nd, struct path *path) static int lookup_slow(struct nameidata *nd, struct path *path)
{ {
struct dentry *dentry, *parent; struct dentry *dentry, *parent;
int err;
parent = nd->path.dentry; parent = nd->path.dentry;
BUG_ON(nd->inode != parent->d_inode); BUG_ON(nd->inode != parent->d_inode);
...@@ -1523,14 +1521,7 @@ static int lookup_slow(struct nameidata *nd, struct path *path) ...@@ -1523,14 +1521,7 @@ static int lookup_slow(struct nameidata *nd, struct path *path)
return PTR_ERR(dentry); return PTR_ERR(dentry);
path->mnt = nd->path.mnt; path->mnt = nd->path.mnt;
path->dentry = dentry; path->dentry = dentry;
err = follow_managed(path, nd); return follow_managed(path, nd);
if (unlikely(err < 0)) {
path_put_conditional(path, nd);
return err;
}
if (err)
nd->flags |= LOOKUP_JUMPED;
return 0;
} }
static inline int may_lookup(struct nameidata *nd) static inline int may_lookup(struct nameidata *nd)
...@@ -3098,10 +3089,7 @@ static int do_last(struct nameidata *nd, ...@@ -3098,10 +3089,7 @@ static int do_last(struct nameidata *nd,
error = follow_managed(&path, nd); error = follow_managed(&path, nd);
if (error < 0) if (error < 0)
goto exit_dput; goto out;
if (error)
nd->flags |= LOOKUP_JUMPED;
BUG_ON(nd->flags & LOOKUP_RCU); BUG_ON(nd->flags & LOOKUP_RCU);
inode = path.dentry->d_inode; inode = path.dentry->d_inode;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment