Commit 638803d4 authored by Bob Peterson's avatar Bob Peterson Committed by Andreas Gruenbacher

Revert "gfs2: Replace gl_revokes with a GLF flag"

Commit 73118ca8 introduced a glock reference counting bug in
gfs2_trans_remove_revoke.  Given that, replacing gl_revokes with a GLF flag is
no longer useful, so revert that commit.
Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent f2c7c76c
...@@ -140,7 +140,7 @@ void gfs2_glock_free(struct gfs2_glock *gl) ...@@ -140,7 +140,7 @@ void gfs2_glock_free(struct gfs2_glock *gl)
{ {
struct gfs2_sbd *sdp = gl->gl_name.ln_sbd; 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); rhashtable_remove_fast(&gl_hash_table, &gl->gl_node, ht_parms);
smp_mb(); smp_mb();
wake_up_glock(gl); wake_up_glock(gl);
...@@ -1801,7 +1801,7 @@ void gfs2_dump_glock(struct seq_file *seq, struct gfs2_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_target),
state2str(gl->gl_demote_state), dtime, state2str(gl->gl_demote_state), dtime,
atomic_read(&gl->gl_ail_count), 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); (int)gl->gl_lockref.count, gl->gl_hold_time);
list_for_each_entry(gh, &gl->gl_holders, gh_list) list_for_each_entry(gh, &gl->gl_holders, gh_list)
......
...@@ -345,7 +345,6 @@ enum { ...@@ -345,7 +345,6 @@ enum {
GLF_OBJECT = 14, /* Used only for tracing */ GLF_OBJECT = 14, /* Used only for tracing */
GLF_BLOCKING = 15, GLF_BLOCKING = 15,
GLF_INODE_CREATING = 16, /* Inode creation occurring */ GLF_INODE_CREATING = 16, /* Inode creation occurring */
GLF_REVOKES = 17, /* Glock has revokes in queue */
}; };
struct gfs2_glock { struct gfs2_glock {
...@@ -375,6 +374,7 @@ struct gfs2_glock { ...@@ -375,6 +374,7 @@ struct gfs2_glock {
struct list_head gl_lru; struct list_head gl_lru;
struct list_head gl_ail_list; struct list_head gl_ail_list;
atomic_t gl_ail_count; atomic_t gl_ail_count;
atomic_t gl_revokes;
struct delayed_work gl_work; struct delayed_work gl_work;
union { union {
/* For inode and iopen glocks only */ /* For inode and iopen glocks only */
......
...@@ -606,10 +606,8 @@ void gfs2_add_revoke(struct gfs2_sbd *sdp, struct gfs2_bufdata *bd) ...@@ -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 */ gfs2_remove_from_ail(bd); /* drops ref on bh */
bd->bd_bh = NULL; bd->bd_bh = NULL;
sdp->sd_log_num_revoke++; sdp->sd_log_num_revoke++;
if (!test_bit(GLF_REVOKES, &gl->gl_flags)) { if (atomic_inc_return(&gl->gl_revokes) == 1)
set_bit(GLF_REVOKES, &gl->gl_flags);
gfs2_glock_hold(gl); gfs2_glock_hold(gl);
}
set_bit(GLF_LFLUSH, &gl->gl_flags); set_bit(GLF_LFLUSH, &gl->gl_flags);
list_add(&bd->bd_list, &sdp->sd_log_revokes); list_add(&bd->bd_list, &sdp->sd_log_revokes);
} }
......
...@@ -860,34 +860,19 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) ...@@ -860,34 +860,19 @@ static void revoke_lo_before_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) static void revoke_lo_after_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr)
{ {
struct list_head *head = &sdp->sd_log_revokes; struct list_head *head = &sdp->sd_log_revokes;
struct gfs2_bufdata *bd, *tmp; struct gfs2_bufdata *bd;
struct gfs2_glock *gl;
/*
* Glocks can be referenced repeatedly on the revoke list, but the list
* only holds one reference. All glocks on the list will have the
* GLF_REVOKES flag set initially.
*/
list_for_each_entry_safe(bd, tmp, head, bd_list) {
struct gfs2_glock *gl = bd->bd_gl;
if (test_bit(GLF_REVOKES, &gl->gl_flags)) {
/* Keep each glock on the list exactly once. */
clear_bit(GLF_REVOKES, &gl->gl_flags);
continue;
}
list_del(&bd->bd_list);
kmem_cache_free(gfs2_bufdata_cachep, bd);
}
list_for_each_entry_safe(bd, tmp, head, bd_list) {
struct gfs2_glock *gl = bd->bd_gl;
list_del(&bd->bd_list); while (!list_empty(head)) {
kmem_cache_free(gfs2_bufdata_cachep, bd); bd = list_entry(head->next, struct gfs2_bufdata, bd_list);
list_del_init(&bd->bd_list);
gl = bd->bd_gl;
if (atomic_dec_return(&gl->gl_revokes) == 0) {
clear_bit(GLF_LFLUSH, &gl->gl_flags); clear_bit(GLF_LFLUSH, &gl->gl_flags);
gfs2_glock_queue_put(gl); gfs2_glock_queue_put(gl);
} }
/* the list is empty now */ kmem_cache_free(gfs2_bufdata_cachep, bd);
}
} }
static void revoke_lo_before_scan(struct gfs2_jdesc *jd, static void revoke_lo_before_scan(struct gfs2_jdesc *jd,
......
...@@ -59,6 +59,7 @@ static void gfs2_init_glock_once(void *foo) ...@@ -59,6 +59,7 @@ static void gfs2_init_glock_once(void *foo)
INIT_LIST_HEAD(&gl->gl_lru); INIT_LIST_HEAD(&gl->gl_lru);
INIT_LIST_HEAD(&gl->gl_ail_list); INIT_LIST_HEAD(&gl->gl_ail_list);
atomic_set(&gl->gl_ail_count, 0); atomic_set(&gl->gl_ail_count, 0);
atomic_set(&gl->gl_revokes, 0);
} }
static void gfs2_init_gl_aspace_once(void *foo) static void gfs2_init_gl_aspace_once(void *foo)
......
...@@ -1477,7 +1477,7 @@ static void gfs2_final_release_pages(struct gfs2_inode *ip) ...@@ -1477,7 +1477,7 @@ static void gfs2_final_release_pages(struct gfs2_inode *ip)
truncate_inode_pages(gfs2_glock2aspace(ip->i_gl), 0); truncate_inode_pages(gfs2_glock2aspace(ip->i_gl), 0);
truncate_inode_pages(&inode->i_data, 0); truncate_inode_pages(&inode->i_data, 0);
if (!test_bit(GLF_REVOKES, &gl->gl_flags)) { if (atomic_read(&gl->gl_revokes) == 0) {
clear_bit(GLF_LFLUSH, &gl->gl_flags); clear_bit(GLF_LFLUSH, &gl->gl_flags);
clear_bit(GLF_DIRTY, &gl->gl_flags); clear_bit(GLF_DIRTY, &gl->gl_flags);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment