Commit dc8ca9cc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents 5d6b501f 638803d4

fs/gfs2/glock.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

fs/gfs2/incore.h

+1 −1
Original line number Diff line number Diff line
@@ -345,7 +345,6 @@ enum { 
	GLF_OBJECT			= 14, /* Used only for tracing */

	GLF_BLOCKING			= 15,

	GLF_INODE_CREATING		= 16, /* Inode creation occurring */

	GLF_REVOKES			= 17, /* Glock has revokes in queue */

};



struct gfs2_glock {
@@ -375,6 +374,7 @@ struct gfs2_glock { 
	struct list_head gl_lru;

	struct list_head gl_ail_list;

	atomic_t gl_ail_count;

	atomic_t gl_revokes;

	struct delayed_work gl_work;

	union {

		/* For inode and iopen glocks only */

fs/gfs2/log.c

+1 −3
Original line number Diff line number Diff line
@@ -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);

}

fs/gfs2/lops.c

+9 −24
Original line number Diff line number Diff line
@@ -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)

{

	struct list_head *head = &sdp->sd_log_revokes;

	struct gfs2_bufdata *bd, *tmp;



	/*

	 * 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;

	struct gfs2_bufdata *bd;

	struct gfs2_glock *gl;



		list_del(&bd->bd_list);

		kmem_cache_free(gfs2_bufdata_cachep, bd);

	while (!list_empty(head)) {

		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);

			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,

fs/gfs2/main.c

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ static void gfs2_init_glock_once(void *foo) 
	INIT_LIST_HEAD(&gl->gl_lru);

	INIT_LIST_HEAD(&gl->gl_ail_list);

	atomic_set(&gl->gl_ail_count, 0);

	atomic_set(&gl->gl_revokes, 0);

}



static void gfs2_init_gl_aspace_once(void *foo)