Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 310057
b: refs/heads/master
c: decf340
h: refs/heads/master
i:
  310055: 25a2f95
v: v3
  • Loading branch information
Miklos Szeredi authored and Al Viro committed Jun 1, 2012
1 parent 95b1f70 commit 6cbf4ae
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a1eb33153090549e622ab42cb375af06614dd7a8
refs/heads/master: decf3400879d02d0eafedea52c7f208587be062a
8 changes: 5 additions & 3 deletions trunk/fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -2358,15 +2358,17 @@ static struct file *do_last(struct nameidata *nd, struct path *path,
if (error)
nd->flags |= LOOKUP_JUMPED;

BUG_ON(nd->flags & LOOKUP_RCU);
inode = path->dentry->d_inode;
error = -ENOENT;
if (!path->dentry->d_inode)
if (!inode)
goto exit_dput;

if (path->dentry->d_inode->i_op->follow_link)
if (inode->i_op->follow_link)
return NULL;

path_to_nameidata(path, nd);
nd->inode = path->dentry->d_inode;
nd->inode = inode;
/* Why this, you ask? _Now_ we might have grown LOOKUP_JUMPED... */
error = complete_walk(nd);
if (error)
Expand Down

0 comments on commit 6cbf4ae

Please sign in to comment.