Skip to content

Commit

Permalink
link_path_walk(): move assignments to nd->last/nd->last_type up
Browse files Browse the repository at this point in the history
... and clean the main loop a bit

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
  • Loading branch information
Al Viro committed Feb 23, 2013
1 parent ad8ca37 commit 5f4a6a6
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions fs/namei.c
Original file line number Diff line number Diff line change
Expand Up @@ -1802,8 +1802,11 @@ static int link_path_walk(const char *name, struct nameidata *nd)
}
}

nd->last = this;
nd->last_type = type;

if (!name[len])
goto last_component;
return 0;
/*
* If it wasn't NUL, we know it was '/'. Skip that
* slash, and continue until no more slashes.
Expand All @@ -1812,7 +1815,8 @@ static int link_path_walk(const char *name, struct nameidata *nd)
len++;
} while (unlikely(name[len] == '/'));
if (!name[len])
goto last_component;
return 0;

name += len;

err = walk_component(nd, &next, &this, type, LOOKUP_FOLLOW);
Expand All @@ -1824,16 +1828,10 @@ static int link_path_walk(const char *name, struct nameidata *nd)
if (err)
return err;
}
if (can_lookup(nd->inode))
continue;
err = -ENOTDIR;
break;
/* here ends the main loop */

last_component:
nd->last = this;
nd->last_type = type;
return 0;
if (!can_lookup(nd->inode)) {
err = -ENOTDIR;
break;
}
}
terminate_walk(nd);
return err;
Expand Down

0 comments on commit 5f4a6a6

Please sign in to comment.