namei: unlazy_walk() doesn't need to mess with current->fs anymore
authorAl Viro <viro@zeniv.linux.org.uk>
Tue, 12 May 2015 04:10:18 +0000 (00:10 -0400)
committerAl Viro <viro@zeniv.linux.org.uk>
Fri, 15 May 2015 05:10:36 +0000 (01:10 -0400)
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>
fs/namei.c

index a5ed0d070a2057741cd579482039b3f9538dd2a2..0cccb24ac0b7e9495695d016313db6565d2de871 100644 (file)
@@ -651,7 +651,6 @@ static bool legitimize_links(struct nameidata *nd)
  */
 static int unlazy_walk(struct nameidata *nd, struct dentry *dentry, unsigned seq)
 {
-       struct fs_struct *fs = current->fs;
        struct dentry *parent = nd->path.dentry;
 
        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.
         */
        if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) {
-               spin_lock(&fs->lock);
-               if (unlikely(!path_equal(&nd->root, &fs->root))) {
-                       spin_unlock(&fs->lock);
-                       goto drop_dentry;
+               if (unlikely(!legitimize_path(nd, &nd->root, nd->root_seq))) {
+                       rcu_read_unlock();
+                       dput(dentry);
+                       return -ECHILD;
                }
-               path_get(&nd->root);
-               spin_unlock(&fs->lock);
        }
 
        rcu_read_unlock();