Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2bcd610d authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

[GFS2] Don't add glocks to the journal 



The only reason for adding glocks to the journal was to keep track
of which locks required a log flush prior to release. We add a
flag to the glock to allow this check to be made in a simpler way.

This reduces the size of a glock (by 12 bytes on i386, 24 on x86_64)
and means that we can avoid extra work during the journal flush.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
parent 8cbc4342

fs/gfs2/glock.c

+0 −3
Original line number Diff line number Diff line
@@ -346,7 +346,6 @@ int gfs2_glock_get(struct gfs2_sbd *sdp, u64 number, 
	gl->gl_object = NULL;

	gl->gl_sbd = sdp;

	gl->gl_aspace = NULL;

	lops_init_le(&gl->gl_le, &gfs2_glock_lops);

	INIT_DELAYED_WORK(&gl->gl_work, glock_work_func);



	/* If this glock protects actual on-disk data or metadata blocks,
@@ -1900,8 +1899,6 @@ static int dump_glock(struct glock_iter *gi, struct gfs2_glock *gl) 
	print_dbg(gi, "  req_bh = %s\n", (gl->gl_req_bh) ? "yes" : "no");

	print_dbg(gi, "  lvb_count = %d\n", atomic_read(&gl->gl_lvb_count));

	print_dbg(gi, "  object = %s\n", (gl->gl_object) ? "yes" : "no");

	print_dbg(gi, "  le = %s\n",

		   (list_empty(&gl->gl_le.le_list)) ? "no" : "yes");

	print_dbg(gi, "  reclaim = %s\n",

		   (list_empty(&gl->gl_reclaim)) ? "no" : "yes");

	if (gl->gl_aspace)

fs/gfs2/incore.h

+1 −3
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ enum { 
	GLF_PENDING_DEMOTE	= 4,

	GLF_DIRTY		= 5,

	GLF_DEMOTE_IN_PROGRESS	= 6,

	GLF_LFLUSH		= 7,

};



struct gfs2_glock {
@@ -208,7 +209,6 @@ struct gfs2_glock { 
	struct gfs2_sbd *gl_sbd;



	struct inode *gl_aspace;

	struct gfs2_log_element gl_le;

	struct list_head gl_ail_list;

	atomic_t gl_ail_count;

	struct delayed_work gl_work;
@@ -584,13 +584,11 @@ struct gfs2_sbd { 
	unsigned int sd_log_commited_databuf;

	unsigned int sd_log_commited_revoke;



	unsigned int sd_log_num_gl;

	unsigned int sd_log_num_buf;

	unsigned int sd_log_num_revoke;

	unsigned int sd_log_num_rg;

	unsigned int sd_log_num_databuf;



	struct list_head sd_log_le_gl;

	struct list_head sd_log_le_buf;

	struct list_head sd_log_le_revoke;

	struct list_head sd_log_le_rg;

fs/gfs2/inode.c

+2 −1
Original line number Diff line number Diff line
@@ -362,7 +362,8 @@ int gfs2_dinode_dealloc(struct gfs2_inode *ip) 
	if (error)

		goto out_rg_gunlock;



	gfs2_trans_add_gl(ip->i_gl);

	set_bit(GLF_DIRTY, &ip->i_gl->gl_flags);

	set_bit(GLF_LFLUSH, &ip->i_gl->gl_flags);



	gfs2_free_di(rgd, ip);

fs/gfs2/log.c

+5 −10
Original line number Diff line number Diff line
@@ -692,21 +692,17 @@ static void gfs2_ordered_wait(struct gfs2_sbd *sdp) 
 *

 */



void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl)

void __gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl)

{

	struct gfs2_ail *ai;



	down_write(&sdp->sd_log_flush_lock);



	if (gl) {

		gfs2_log_lock(sdp);

		if (list_empty(&gl->gl_le.le_list)) {

			gfs2_log_unlock(sdp);

	/* Log might have been flushed while we waited for the flush lock */

	if (gl && !test_bit(GLF_LFLUSH, &gl->gl_flags)) {

		up_write(&sdp->sd_log_flush_lock);

		return;

	}

		gfs2_log_unlock(sdp);

	}



	ai = kzalloc(sizeof(struct gfs2_ail), GFP_NOFS | __GFP_NOFAIL);

	INIT_LIST_HEAD(&ai->ai_ail1_list);
@@ -823,7 +819,6 @@ void gfs2_log_shutdown(struct gfs2_sbd *sdp) 
	down_write(&sdp->sd_log_flush_lock);



	gfs2_assert_withdraw(sdp, !sdp->sd_log_blks_reserved);

	gfs2_assert_withdraw(sdp, !sdp->sd_log_num_gl);

	gfs2_assert_withdraw(sdp, !sdp->sd_log_num_buf);

	gfs2_assert_withdraw(sdp, !sdp->sd_log_num_revoke);

	gfs2_assert_withdraw(sdp, !sdp->sd_log_num_rg);

fs/gfs2/log.h

+8 −1
Original line number Diff line number Diff line
@@ -57,7 +57,14 @@ void gfs2_log_incr_head(struct gfs2_sbd *sdp); 
struct buffer_head *gfs2_log_get_buf(struct gfs2_sbd *sdp);

struct buffer_head *gfs2_log_fake_buf(struct gfs2_sbd *sdp,

				      struct buffer_head *real);

void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl);

void __gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl);



static inline void gfs2_log_flush(struct gfs2_sbd *sbd, struct gfs2_glock *gl)

{

	if (!gl || test_bit(GLF_LFLUSH, &gl->gl_flags))

		__gfs2_log_flush(sbd, gl);

}



void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *trans);

void gfs2_remove_from_ail(struct gfs2_bufdata *bd);