lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make handle_dots() leave RCU mode on error

Browse Source 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro
2011-03-04 14:35:59 -05:00
parent 4455ca6223
commit ef7562d528
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
fs/namei.c
View File

@@ -1052,7 +1052,7 @@ static int follow_dotdot_rcu(struct nameidata *nd)
seq = read_seqcount_begin(&parent->d_seq); seq = read_seqcount_begin(&parent->d_seq);
if (read_seqcount_retry(&old->d_seq, nd->seq)) if (read_seqcount_retry(&old->d_seq, nd->seq))
return -ECHILD; goto failed;
inode = parent->d_inode; inode = parent->d_inode;
nd->path.dentry = parent; nd->path.dentry = parent;
nd->seq = seq; nd->seq = seq;
@@ -1065,8 +1065,14 @@ static int follow_dotdot_rcu(struct nameidata *nd)
} }
__follow_mount_rcu(nd, &nd->path, &inode, true); __follow_mount_rcu(nd, &nd->path, &inode, true);
nd->inode = inode; nd->inode = inode;
return 0; return 0;
failed:
nd->flags &= ~LOOKUP_RCU;
nd->root.mnt = NULL;
rcu_read_unlock();
br_read_unlock(vfsmount_lock);
return -ECHILD;
} }
/* /*
@@ -1405,9 +1411,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
* parent relationships. * parent relationships.
*/ */
if (unlikely(type != LAST_NORM)) { if (unlikely(type != LAST_NORM)) {
err = handle_dots(nd, type); if (handle_dots(nd, type))
if (err) return -ECHILD;
goto return_err;
continue; continue;
} }
@@ -1441,12 +1446,8 @@ last_component:
nd->flags &= lookup_flags | ~LOOKUP_CONTINUE; nd->flags &= lookup_flags | ~LOOKUP_CONTINUE;
if (lookup_flags & LOOKUP_PARENT) if (lookup_flags & LOOKUP_PARENT)
goto lookup_parent; goto lookup_parent;
if (unlikely(type != LAST_NORM)) { if (unlikely(type != LAST_NORM))
err = handle_dots(nd, type); return handle_dots(nd, type);
if (err)
goto return_err;
return 0;
}
err = do_lookup(nd, &this, &next, &inode); err = do_lookup(nd, &this, &next, &inode);
if (err) if (err)
break; break;