diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 12:33:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-06-06 12:33:52 -0700 |
| commit | dc8ca9cc6e23054eb85599c9417ef2416848e7e8 (patch) | |
| tree | ea31d2b14bb256043db8186525f0eb07776ecd65 /fs/gfs2/log.c | |
| parent | 5d6b501fe5421c5df662e2935f55f5e3d2b5e012 (diff) | |
| parent | 638803d4568121d73a266e440530f880ffa2dacc (diff) | |
| download | linux-dc8ca9cc6e23054eb85599c9417ef2416848e7e8.tar.bz2 | |
Merge tag 'gfs2-v5.2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2
Pull gfs2 fix from Andreas Gruenbacher:
"A revert for a patch that turned out to be broken"
* tag 'gfs2-v5.2.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
Revert "gfs2: Replace gl_revokes with a GLF flag"
Diffstat (limited to 'fs/gfs2/log.c')
| -rw-r--r-- | fs/gfs2/log.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index a2e1df488df0..86703c95353e 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -606,10 +606,8 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) gfs2_remove_from_ail(bd); /* drops ref on bh */ bd->bd_bh = NULL; sdp->sd_log_num_revoke++; - if (!test_bit(GLF_REVOKES, &gl->gl_flags)) { - set_bit(GLF_REVOKES, &gl->gl_flags); + if (atomic_inc_return(&gl->gl_revokes) == 1) gfs2_glock_hold(gl); - } set_bit(GLF_LFLUSH, &gl->gl_flags); list_add(&bd->bd_list, &sdp->sd_log_revokes); } |