diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-06 13:51:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-06 13:51:49 -0800 |
| commit | d8cd93ea67af2391f8718cf06b4b8084d38a3428 (patch) | |
| tree | 5fd2f7374e4fe069258e0d8b7f55141d96f01261 /fs/namei.c | |
| parent | fb7b26e47ef932a21f0cac4cf04e8f51105d77d7 (diff) | |
| parent | 2788cc47f4593cca2c3c73c7bb82cd32b88c8ef7 (diff) | |
| download | linux-d8cd93ea67af2391f8718cf06b4b8084d38a3428.tar.gz linux-d8cd93ea67af2391f8718cf06b4b8084d38a3428.tar.bz2 linux-d8cd93ea67af2391f8718cf06b4b8084d38a3428.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
Pull vfs fixes from Al Viro:
"A couple of fixes (-stable fodder) + dead code removal after the
overlayfs fix.
I agree that it's better to separate from the fix part to make
backporting easier, but IMO it's not worth delaying said dead code
removal until the next window"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
Don't reset ->total_link_count on nested calls of vfs_path_lookup()
ovl: get rid of the dead code left from broken (and disabled) optimizations
ovl: fix permission checking for setattr
Diffstat (limited to 'fs/namei.c')
| -rw-r--r-- | fs/namei.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/namei.c b/fs/namei.c index d84d7c7515fc..0c3974cd3ecd 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1996,7 +1996,6 @@ static const char *path_init(struct nameidata *nd, unsigned flags) nd->last_type = LAST_ROOT; /* if there are only slashes... */ nd->flags = flags | LOOKUP_JUMPED | LOOKUP_PARENT; nd->depth = 0; - nd->total_link_count = 0; if (flags & LOOKUP_ROOT) { struct dentry *root = nd->root.dentry; struct inode *inode = root->d_inode; |