diff options
| author | Andrea Parri <andrea.parri@amarulasolutions.com> | 2019-05-20 19:23:58 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-08-06 19:06:50 +0200 |
| commit | b39c377ea08f377367297b7369f0e580c5cd189d (patch) | |
| tree | d1582cc0b6a5e4813a455b57090fd1566e110d96 /fs/ceph | |
| parent | d29fbf6779639cec8c04e1087c3feaab4c7b5e58 (diff) | |
| download | linux-stable-b39c377ea08f377367297b7369f0e580c5cd189d.tar.gz linux-stable-b39c377ea08f377367297b7369f0e580c5cd189d.tar.bz2 linux-stable-b39c377ea08f377367297b7369f0e580c5cd189d.zip | |
ceph: fix improper use of smp_mb__before_atomic()
[ Upstream commit 749607731e26dfb2558118038c40e9c0c80d23b5 ]
This barrier only applies to the read-modify-write operations; in
particular, it does not apply to the atomic64_set() primitive.
Replace the barrier with an smp_mb().
Fixes: fdd4e15838e59 ("ceph: rework dcache readdir")
Reported-by: "Paul E. McKenney" <paulmck@linux.ibm.com>
Reported-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Andrea Parri <andrea.parri@amarulasolutions.com>
Reviewed-by: "Yan, Zheng" <zyan@redhat.com>
Signed-off-by: Ilya Dryomov <idryomov@gmail.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'fs/ceph')
| -rw-r--r-- | fs/ceph/super.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/fs/ceph/super.h b/fs/ceph/super.h index 582e28fd1b7b..d8579a56e5dc 100644 --- a/fs/ceph/super.h +++ b/fs/ceph/super.h @@ -526,7 +526,12 @@ static inline void __ceph_dir_set_complete(struct ceph_inode_info *ci, long long release_count, long long ordered_count) { - smp_mb__before_atomic(); + /* + * Makes sure operations that setup readdir cache (update page + * cache and i_size) are strongly ordered w.r.t. the following + * atomic64_set() operations. + */ + smp_mb(); atomic64_set(&ci->i_complete_seq[0], release_count); atomic64_set(&ci->i_complete_seq[1], ordered_count); } |