aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/super.c
diff options
context:
space:
mode:
authorBob Peterson <rpeterso@redhat.com>2019-11-14 09:53:36 -0500
committerAndreas Gruenbacher <agruenba@redhat.com>2019-11-14 19:47:05 +0100
commit60528afa78667baf5ffe8e57ccbe77cd024534c5 (patch)
tree5a86896db148d68d05326c5243b4de61578d1e4e /fs/gfs2/super.c
parentgfs2: fix infinite loop in gfs2_ail1_flush on io error (diff)
downloadlinux-dev-60528afa78667baf5ffe8e57ccbe77cd024534c5.tar.xz
linux-dev-60528afa78667baf5ffe8e57ccbe77cd024534c5.zip
gfs2: Don't loop forever in gfs2_freeze if withdrawn
Before this patch, function gfs2_freeze would loop forever if the filesystem it tries to freeze is withdrawn. That's because function gfs2_lock_fs_check_clean tries to enqueue the glock of the journal and the gfs2_glock returns -EIO because you can't enqueue a journaled glock after a withdraw. Move the check for file system withdraw inside the loop so that the loop can end when withdraw occurs. Signed-off-by: Bob Peterson <rpeterso@redhat.com> Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Diffstat (limited to '')
-rw-r--r--fs/gfs2/super.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 478015bc6890..8154c38e488b 100644
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -761,12 +761,12 @@ static int gfs2_freeze(struct super_block *sb)
if (atomic_read(&sdp->sd_freeze_state) != SFS_UNFROZEN)
goto out;
- if (gfs2_withdrawn(sdp)) {
- error = -EINVAL;
- goto out;
- }
-
for (;;) {
+ if (gfs2_withdrawn(sdp)) {
+ error = -EINVAL;
+ goto out;
+ }
+
error = gfs2_lock_fs_check_clean(sdp, &sdp->sd_freeze_gh);
if (!error)
break;