Merge tag 'gfs2-v6.4-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git...

[platform/kernel/linux-rpi.git] / fs / gfs2 / ops_fstype.c

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index cd96298..8a27957 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -135,7 +135,6 @@ static struct gfs2_sbd *init_sbd(struct super_block *sb)
        init_rwsem(&sdp->sd_log_flush_lock);
        atomic_set(&sdp->sd_log_in_flight, 0);
        init_waitqueue_head(&sdp->sd_log_flush_wait);
-       atomic_set(&sdp->sd_freeze_state, SFS_UNFROZEN);
        mutex_init(&sdp->sd_freeze_mutex);
 
        return sdp;
@@ -434,7 +433,7 @@ static int init_locking(struct gfs2_sbd *sdp, struct gfs2_holder *mount_gh,
        error = gfs2_glock_get(sdp, GFS2_FREEZE_LOCK, &gfs2_freeze_glops,
                               CREATE, &sdp->sd_freeze_gl);
        if (error) {
-               fs_err(sdp, "can't create transaction glock: %d\n", error);
+               fs_err(sdp, "can't create freeze glock: %d\n", error);
                goto fail_rename;
        }
 
@@ -1140,7 +1139,6 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
        int silent = fc->sb_flags & SB_SILENT;
        struct gfs2_sbd *sdp;
        struct gfs2_holder mount_gh;
-       struct gfs2_holder freeze_gh;
        int error;
 
        sdp = init_sbd(sb);
@@ -1269,15 +1267,15 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
                }
        }
 
-       error = gfs2_freeze_lock(sdp, &freeze_gh, 0);
+       error = gfs2_freeze_lock_shared(sdp);
        if (error)
                goto fail_per_node;
 
        if (!sb_rdonly(sb))
                error = gfs2_make_fs_rw(sdp);
 
-       gfs2_freeze_unlock(&freeze_gh);
        if (error) {
+               gfs2_freeze_unlock(&sdp->sd_freeze_gh);
                if (sdp->sd_quotad_process)
                        kthread_stop(sdp->sd_quotad_process);
                sdp->sd_quotad_process = NULL;
@@ -1590,12 +1588,6 @@ static int gfs2_reconfigure(struct fs_context *fc)
                fc->sb_flags |= SB_RDONLY;
 
        if ((sb->s_flags ^ fc->sb_flags) & SB_RDONLY) {
-               struct gfs2_holder freeze_gh;
-
-               error = gfs2_freeze_lock(sdp, &freeze_gh, 0);
-               if (error)
-                       return -EINVAL;
-
                if (fc->sb_flags & SB_RDONLY) {
                        gfs2_make_fs_ro(sdp);
                } else {
@@ -1603,7 +1595,6 @@ static int gfs2_reconfigure(struct fs_context *fc)
                        if (error)
                                errorfc(fc, "unable to remount read-write");
                }
-               gfs2_freeze_unlock(&freeze_gh);
        }
        sdp->sd_args = *newargs;