Commit db77789b authored by Andreas Gruenbacher's avatar Andreas Gruenbacher
Browse files

gfs2: journal flush threshold fixes and cleanup 



Commit f07b3520 ("GFS2: Made logd daemon take into account log
demand") changed gfs2_ail_flush_reqd() and gfs2_jrnl_flush_reqd() to
take sd_log_blks_needed into account, but the checks in
gfs2_log_commit() were not updated correspondingly.

Once that is fixed, gfs2_jrnl_flush_reqd() and gfs2_ail_flush_reqd() can
be used in gfs2_log_commit().  Make those two helpers available to
gfs2_log_commit() by defining them above gfs2_log_commit().

Signed-off-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent b6b8f72a

fs/gfs2/log.c

+16 −18
Original line number Diff line number Diff line
@@ -1227,6 +1227,21 @@ static void log_refund(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
	gfs2_log_unlock(sdp);

}



static inline int gfs2_jrnl_flush_reqd(struct gfs2_sbd *sdp)

{

	return atomic_read(&sdp->sd_log_pinned) +

	       atomic_read(&sdp->sd_log_blks_needed) >=

	       atomic_read(&sdp->sd_log_thresh1);

}



static inline int gfs2_ail_flush_reqd(struct gfs2_sbd *sdp)

{

	return sdp->sd_jdesc->jd_blocks -

	       atomic_read(&sdp->sd_log_blks_free) +

	       atomic_read(&sdp->sd_log_blks_needed) >=

	       atomic_read(&sdp->sd_log_thresh2);

}



/**

 * gfs2_log_commit - Commit a transaction to the log

 * @sdp: the filesystem
@@ -1246,9 +1261,7 @@ void gfs2_log_commit(struct gfs2_sbd *sdp, struct gfs2_trans *tr) 
{

	log_refund(sdp, tr);



	if (atomic_read(&sdp->sd_log_pinned) > atomic_read(&sdp->sd_log_thresh1) ||

	    ((sdp->sd_jdesc->jd_blocks - atomic_read(&sdp->sd_log_blks_free)) >

	    atomic_read(&sdp->sd_log_thresh2)))

	if (gfs2_ail_flush_reqd(sdp) || gfs2_jrnl_flush_reqd(sdp))

		wake_up(&sdp->sd_logd_waitq);

}
@@ -1271,21 +1284,6 @@ static void gfs2_log_shutdown(struct gfs2_sbd *sdp) 
	gfs2_assert_warn(sdp, list_empty(&sdp->sd_ail2_list));

}



static inline int gfs2_jrnl_flush_reqd(struct gfs2_sbd *sdp)

{

	return (atomic_read(&sdp->sd_log_pinned) +

		atomic_read(&sdp->sd_log_blks_needed) >=

		atomic_read(&sdp->sd_log_thresh1));

}



static inline int gfs2_ail_flush_reqd(struct gfs2_sbd *sdp)

{

	unsigned int used_blocks = sdp->sd_jdesc->jd_blocks - atomic_read(&sdp->sd_log_blks_free);



	return used_blocks + atomic_read(&sdp->sd_log_blks_needed) >=

		atomic_read(&sdp->sd_log_thresh2);

}



/**

 * gfs2_logd - Update log tail as Active Items get flushed to in-place blocks

 * @data: Pointer to GFS2 superblock