openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

path_parent_directory(): leave changing path->dentry to callers 

Instead of returning 0, return new dentry; instead of returning
-ENOENT, return NULL.  Adjust the callers accordingly.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2020-02-24 16:01:19 -05:00
parent 6b03f7edf4
commit 63b27720a4
1 changed files with 19 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fs/namei.c
View File

@ -1440,19 +1440,21 @@ static void follow_mount(struct path *path)
}
}
static int path_parent_directory(struct path *path)
static struct dentry *path_parent_directory(struct path *path)
{
struct dentry *old = path->dentry;
/* rare case of legitimate dget_parent()... */
path->dentry = dget_parent(path->dentry);
dput(old);
if (unlikely(!path_connected(path->mnt, path->dentry)))
return -ENOENT;
return 0;
struct dentry *parent = dget_parent(path->dentry);
if (unlikely(!path_connected(path->mnt, parent))) {
dput(parent);
parent = NULL;
}
return parent;
}
static int follow_dotdot(struct nameidata *nd)
{
struct dentry *parent;
while (1) {
if (path_equal(&nd->path, &nd->root)) {
if (unlikely(nd->flags & LOOKUP_BENEATH))
@ -1460,9 +1462,11 @@ static int follow_dotdot(struct nameidata *nd)
break;
}
if (nd->path.dentry != nd->path.mnt->mnt_root) {
int ret = path_parent_directory(&nd->path);
if (ret)
return ret;
parent = path_parent_directory(&nd->path);
if (!parent)
return -ENOENT;
dput(nd->path.dentry);
nd->path.dentry = parent;
break;
}
if (!follow_up(&nd->path))
@ -2600,13 +2604,13 @@ int path_pts(struct path *path)
*/
struct dentry *child, *parent;
struct qstr this;
int ret;
ret = path_parent_directory(path);
if (ret)
return ret;
parent = path_parent_directory(path);
if (!parent)
return -ENOENT;
parent = path->dentry;
dput(path->dentry);
path->dentry = parent;
this.name = "pts";
this.len = 3;
child = d_hash_and_lookup(parent, &this);