From: Bob Peterson Date: Wed, 20 Jan 2021 15:12:59 +0000 (-0500) Subject: Revert "GFS2: Re-add a call to log_flush_wait when flushing the journal" X-Git-Tag: v5.12-rc1~63^2~9 X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=4a011849f7595c95a221551ced9179aa3ffb4890;p=linux-block.git Revert "GFS2: Re-add a call to log_flush_wait when flushing the journal" This reverts commit 428fd95d859b24fea448380fa21ad6d841b34241. Patch 428fd95d85b2 added a call to log_flush_wait to function gfs2_log_flush. Then gfs2_log_flush calls log_write_header which submits a write request with the REQ_PREFLUSH flag which also forces it to wait. This patch removes the unnecessary call to log_flush_wait. Signed-off-by: Bob Peterson --- diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c index 2e9314091c81..41d13f19d1b4 100644 --- a/fs/gfs2/log.c +++ b/fs/gfs2/log.c @@ -1004,7 +1004,6 @@ void gfs2_log_flush(struct gfs2_sbd *sdp, struct gfs2_glock *gl, u32 flags) goto out_withdraw; if (sdp->sd_log_head != sdp->sd_log_flush_head) { - log_flush_wait(sdp); log_write_header(sdp, flags); } else if (sdp->sd_log_tail != current_tail(sdp) && !sdp->sd_log_idle){ atomic_dec(&sdp->sd_log_blks_free); /* Adjust for unreserved buffer */