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

Commit 805c0907 authored by Bob Peterson's avatar Bob Peterson
Browse files

GFS2: Log the reason for log flushes in every log header 



This patch just adds the capability for GFS2 to track which function
called gfs2_log_flush. This should make it easier to diagnose
problems based on the sequence of events found in the journals.

Signed-off-by: default avatarBob Peterson <rpeterso@redhat.com>
Reviewed-by: default avatarAndreas Gruenbacher <agruenba@redhat.com>
parent c1696fb8

fs/gfs2/aops.c

+2 −1
Original line number Diff line number Diff line
@@ -448,7 +448,8 @@ static int gfs2_jdata_writepages(struct address_space *mapping, 


	ret = gfs2_write_cache_jdata(mapping, wbc);

	if (ret == 0 && wbc->sync_mode == WB_SYNC_ALL) {

		gfs2_log_flush(sdp, ip->i_gl, GFS2_LOG_HEAD_FLUSH_NORMAL);

		gfs2_log_flush(sdp, ip->i_gl, GFS2_LOG_HEAD_FLUSH_NORMAL |

			       GFS2_LFC_JDATA_WPAGES);

		ret = gfs2_write_cache_jdata(mapping, wbc);

	}

	return ret;

fs/gfs2/file.c

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,8 @@ static int do_gfs2_set_flags(struct file *filp, u32 reqflags, u32 mask) 
	if ((flags ^ new_flags) & GFS2_DIF_JDATA) {

		if (new_flags & GFS2_DIF_JDATA)

			gfs2_log_flush(sdp, ip->i_gl,

				       GFS2_LOG_HEAD_FLUSH_NORMAL);

				       GFS2_LOG_HEAD_FLUSH_NORMAL |

				       GFS2_LFC_SET_FLAGS);

		error = filemap_fdatawrite(inode->i_mapping);

		if (error)

			goto out;

fs/gfs2/glops.c

+12 −6
Original line number Diff line number Diff line
@@ -107,7 +107,8 @@ static void gfs2_ail_empty_gl(struct gfs2_glock *gl) 
	__gfs2_ail_flush(gl, 0, tr.tr_revokes);



	gfs2_trans_end(sdp);

	gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL);

	gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL |

		       GFS2_LFC_AIL_EMPTY_GL);

}



void gfs2_ail_flush(struct gfs2_glock *gl, bool fsync)
@@ -128,7 +129,8 @@ void gfs2_ail_flush(struct gfs2_glock *gl, bool fsync) 
		return;

	__gfs2_ail_flush(gl, fsync, max_revokes);

	gfs2_trans_end(sdp);

	gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL);

	gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL |

		       GFS2_LFC_AIL_FLUSH);

}



/**
@@ -157,7 +159,8 @@ static void rgrp_go_sync(struct gfs2_glock *gl) 
		return;

	GLOCK_BUG_ON(gl, gl->gl_state != LM_ST_EXCLUSIVE);



	gfs2_log_flush(sdp, gl, GFS2_LOG_HEAD_FLUSH_NORMAL);

	gfs2_log_flush(sdp, gl, GFS2_LOG_HEAD_FLUSH_NORMAL |

		       GFS2_LFC_RGRP_GO_SYNC);

	filemap_fdatawrite_range(mapping, gl->gl_vm.start, gl->gl_vm.end);

	error = filemap_fdatawait_range(mapping, gl->gl_vm.start, gl->gl_vm.end);

	mapping_set_error(mapping, error);
@@ -252,7 +255,8 @@ static void inode_go_sync(struct gfs2_glock *gl) 


	GLOCK_BUG_ON(gl, gl->gl_state != LM_ST_EXCLUSIVE);



	gfs2_log_flush(gl->gl_name.ln_sbd, gl, GFS2_LOG_HEAD_FLUSH_NORMAL);

	gfs2_log_flush(gl->gl_name.ln_sbd, gl, GFS2_LOG_HEAD_FLUSH_NORMAL |

		       GFS2_LFC_INODE_GO_SYNC);

	filemap_fdatawrite(metamapping);

	if (isreg) {

		struct address_space *mapping = ip->i_inode.i_mapping;
@@ -304,7 +308,8 @@ static void inode_go_inval(struct gfs2_glock *gl, int flags) 


	if (ip == GFS2_I(gl->gl_name.ln_sbd->sd_rindex)) {

		gfs2_log_flush(gl->gl_name.ln_sbd, NULL,

			       GFS2_LOG_HEAD_FLUSH_NORMAL);

			       GFS2_LOG_HEAD_FLUSH_NORMAL |

			       GFS2_LFC_INODE_GO_INVAL);

		gl->gl_name.ln_sbd->sd_rindex_uptodate = 0;

	}

	if (ip && S_ISREG(ip->i_inode.i_mode))
@@ -496,7 +501,8 @@ static void freeze_go_sync(struct gfs2_glock *gl) 
			gfs2_assert_withdraw(sdp, 0);

		}

		queue_work(gfs2_freeze_wq, &sdp->sd_freeze_work);

		gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_FREEZE);

		gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_FREEZE |

			       GFS2_LFC_FREEZE_GO_SYNC);

	}

}

fs/gfs2/log.c

+8 −6
Original line number Diff line number Diff line
@@ -757,7 +757,7 @@ static void log_write_header(struct gfs2_sbd *sdp, u32 flags) 
 * gfs2_log_flush - flush incore transaction(s)

 * @sdp: the filesystem

 * @gl: The glock structure to flush.  If NULL, flush the whole incore log

 * @flags: The log header flags: GFS2_LOG_HEAD_FLUSH_*

 * @flags: The log header flags: GFS2_LOG_HEAD_FLUSH_* and debug flags

 *

 */
@@ -773,7 +773,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) 
		up_write(&sdp->sd_log_flush_lock);

		return;

	}

	trace_gfs2_log_flush(sdp, 1);

	trace_gfs2_log_flush(sdp, 1, flags);



	if (flags & GFS2_LOG_HEAD_FLUSH_SHUTDOWN)

		clear_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags);
@@ -841,7 +841,7 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) 
			atomic_set(&sdp->sd_freeze_state, SFS_FROZEN);

	}



	trace_gfs2_log_flush(sdp, 0);

	trace_gfs2_log_flush(sdp, 0, flags);

	up_write(&sdp->sd_log_flush_lock);



	kfree(tr);
@@ -937,7 +937,7 @@ void gfs2_log_shutdown(struct gfs2_sbd *sdp) 


	sdp->sd_log_flush_head = sdp->sd_log_head;



	log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT);

	log_write_header(sdp, GFS2_LOG_HEAD_UNMOUNT | GFS2_LFC_SHUTDOWN);



	gfs2_assert_warn(sdp, sdp->sd_log_head == sdp->sd_log_tail);

	gfs2_assert_warn(sdp, list_empty(&sdp->sd_ail2_list));
@@ -993,7 +993,8 @@ int gfs2_logd(void *data) 
		did_flush = false;

		if (gfs2_jrnl_flush_reqd(sdp) || t == 0) {

			gfs2_ail1_empty(sdp);

			gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL);

			gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL |

				       GFS2_LFC_LOGD_JFLUSH_REQD);

			did_flush = true;

		}
@@ -1001,7 +1002,8 @@ int gfs2_logd(void *data) 
			gfs2_ail1_start(sdp);

			gfs2_ail1_wait(sdp);

			gfs2_ail1_empty(sdp);

			gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL);

			gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_NORMAL |

				       GFS2_LFC_LOGD_AIL_FLUSH_REQD);

			did_flush = true;

		}

fs/gfs2/ops_fstype.c

+1 −1
Original line number Diff line number Diff line
@@ -1382,7 +1382,7 @@ static void gfs2_kill_sb(struct super_block *sb) 
		return;

	}



	gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_SYNC);

	gfs2_log_flush(sdp, NULL, GFS2_LOG_HEAD_FLUSH_SYNC | GFS2_LFC_KILL_SB);

	dput(sdp->sd_root_dir);

	dput(sdp->sd_master_dir);

	sdp->sd_root_dir = NULL;