diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-04 02:52:15 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2015-05-11 04:20:03 +0200 |
| commit | da4e0be04d8816bbb9420c1da05ce09f502c5b75 (patch) | |
| tree | 6643e485a994b2aadd9363f8a96bf49cac03b2db /fs | |
| parent | link_path_walk: nd->depth massage, part 2 (diff) | |
| download | linux-da4e0be04d8816bbb9420c1da05ce09f502c5b75.tar.xz linux-da4e0be04d8816bbb9420c1da05ce09f502c5b75.zip | |
link_path_walk: nd->depth massage, part 3
remove decrement/increment surrounding nd_alloc_stack(), adjust the
test in it.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/namei.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/namei.c b/fs/namei.c index a4034255d827..3df4731a7467 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -539,7 +539,7 @@ static int __nd_alloc_stack(struct nameidata *nd) static inline int nd_alloc_stack(struct nameidata *nd) { - if (likely(nd->depth != EMBEDDED_LEVELS - 1)) + if (likely(nd->depth != EMBEDDED_LEVELS)) return 0; if (likely(nd->stack != nd->internal)) return 0; @@ -1824,9 +1824,7 @@ Walked: if (err) { const char *s; - nd->depth--; err = nd_alloc_stack(nd); - nd->depth++; if (unlikely(err)) { path_to_nameidata(&nd->link, nd); break; |