diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-09-14 03:50:45 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-09-14 04:14:16 +0200 |
| commit | f5be3e29127aec8c87f883aadadff337f8c2cfd7 (patch) | |
| tree | ed5a52d9383df491c449779a6b13fd29c95a2b20 /fs/namei.c | |
| parent | move the call of __d_drop(anon) into __d_materialise_unique(dentry, anon) (diff) | |
| download | linux-f5be3e29127aec8c87f883aadadff337f8c2cfd7.tar.xz linux-f5be3e29127aec8c87f883aadadff337f8c2cfd7.zip | |
fix bogus read_seqretry() checks introduced in b37199e
read_seqretry() returns true on mismatch, not on match...
Cc: stable@vger.kernel.org # 3.15+
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to '')
| -rw-r--r-- | fs/namei.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/namei.c b/fs/namei.c index a996bb48dfab..3d1dc745f9d8 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1137,7 +1137,7 @@ static bool __follow_mount_rcu(struct nameidata *nd, struct path *path, */ *inode = path->dentry->d_inode; } - return read_seqretry(&mount_lock, nd->m_seq) && + return !read_seqretry(&mount_lock, nd->m_seq) && !(path->dentry->d_flags & DCACHE_NEED_AUTOMOUNT); } @@ -1174,7 +1174,7 @@ static int follow_dotdot_rcu(struct nameidata *nd) nd->path.mnt = &mounted->mnt; nd->path.dentry = mounted->mnt.mnt_root; nd->seq = read_seqcount_begin(&nd->path.dentry->d_seq); - if (!read_seqretry(&mount_lock, nd->m_seq)) + if (read_seqretry(&mount_lock, nd->m_seq)) goto failed; } nd->inode = nd->path.dentry->d_inode; |