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/glock.c | |
| parent | 5d6b501fe5421c5df662e2935f55f5e3d2b5e012 (diff) | |
| parent | 638803d4568121d73a266e440530f880ffa2dacc (diff) | |
| download | linux-dc8ca9cc6e23054eb85599c9417ef2416848e7e8.tar.gz linux-dc8ca9cc6e23054eb85599c9417ef2416848e7e8.tar.bz2 linux-dc8ca9cc6e23054eb85599c9417ef2416848e7e8.zip | |
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/glock.c')
| -rw-r--r-- | fs/gfs2/glock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 15c605cfcfc8..71c28ff98b56 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -140,7 +140,7 @@ void gfs2_glock_free(struct gfs2_glock *gl) { struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; - BUG_ON(test_bit(GLF_REVOKES, &gl->gl_flags)); + BUG_ON(atomic_read(&gl->gl_revokes)); rhashtable_remove_fast(&gl_hash_table, &gl->gl_node, ht_parms); smp_mb(); wake_up_glock(gl); @@ -1801,7 +1801,7 @@ void gfs2_dump_glock(struct seq_file *seq, struct gfs2_glock *gl) state2str(gl->gl_target), state2str(gl->gl_demote_state), dtime, atomic_read(&gl->gl_ail_count), - test_bit(GLF_REVOKES, &gl->gl_flags) ? 1 : 0, + atomic_read(&gl->gl_revokes), (int)gl->gl_lockref.count, gl->gl_hold_time); list_for_each_entry(gh, &gl->gl_holders, gh_list) |