redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

update nd->inode in __do_follow_link() instead of after do_follow_link()

Browse source 
... and note that we only need to do it for LAST_BIND symlinks

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2011-03-14 20:01:51 -04:00
parent ce57dfc179
commit b21041d0f7
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
fs/namei.c
View file

@ -768,7 +768,8 @@ __do_follow_link(const struct path *link, struct nameidata *nd, void **p)
error = __vfs_follow_link(nd, s);
else if (nd->last_type == LAST_BIND) {
nd->flags |= LOOKUP_JUMPED;
if (nd->path.dentry->d_inode->i_op->follow_link) {
nd->inode = nd->path.dentry->d_inode;
if (nd->inode->i_op->follow_link) {
/* stepped on a _really_ weird one */
path_put(&nd->path);
error = -ELOOP;
@ -1449,7 +1450,6 @@ static int link_path_walk(const char *name, struct nameidata *nd)
err = do_follow_link(&next, nd);
if (err)
return err;
nd->inode = nd->path.dentry->d_inode;
}
err = -ENOTDIR;
if (!nd->inode->i_op->lookup)
@ -1475,7 +1475,6 @@ last_component:
err = do_follow_link(&next, nd);
if (err)
return err;
nd->inode = nd->path.dentry->d_inode;
}
if (lookup_flags & LOOKUP_DIRECTORY) {
err = -ENOTDIR;