summaryrefslogtreecommitdiff
path: root/fs/gfs2
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2021-01-20 18:12:59 +0300
committerBob Peterson <rpeterso@redhat.com>2021-01-25 16:08:44 +0300
commit4a011849f7595c95a221551ced9179aa3ffb4890 (patch)
treea93e50e9b585b972af3ee0399247d32b26a449c2 /fs/gfs2
parentbff2e532d433a1de3ec11aa0a525ceb08ba8f960 (diff)
downloadlinux-4a011849f7595c95a221551ced9179aa3ffb4890.tar.xz
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 <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r--fs/gfs2/log.c1
1 files changed, 0 insertions, 1 deletions
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 */