leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

namei: unlazy_walk() doesn't need to mess with current->fs anymore

Browse Source 
now that we have ->root_seq, legitimize_path(&nd->root, nd->root_seq)
will do just fine...

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Al Viro 2015-05-12 00:10:18 -04:00
parent 203bc643db
commit 5a8d87e8ed
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/namei.c
View File

@ -651,7 +651,6 @@ static bool legitimize_links(struct nameidata *nd)
*/ */
static int unlazy_walk(struct nameidata *nd, struct dentry *dentry, unsigned seq) static int unlazy_walk(struct nameidata *nd, struct dentry *dentry, unsigned seq)
{ {
struct fs_struct *fs = current->fs;
struct dentry *parent = nd->path.dentry; struct dentry *parent = nd->path.dentry;
BUG_ON(!(nd->flags & LOOKUP_RCU)); BUG_ON(!(nd->flags & LOOKUP_RCU));
@ -691,13 +690,11 @@ static int unlazy_walk(struct nameidata *nd, struct dentry *dentry, unsigned seq
* still valid and get it if required. * still valid and get it if required.
*/ */
if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) { if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {
spin_lock(&fs->lock); if (unlikely(!legitimize_path(nd, &nd->root, nd->root_seq))) {
if (unlikely(!path_equal(&nd->root, &fs->root))) { rcu_read_unlock();
spin_unlock(&fs->lock); dput(dentry);
goto drop_dentry; return -ECHILD;
} }
path_get(&nd->root);
spin_unlock(&fs->lock);
} }
rcu_read_unlock(); rcu_read_unlock();