gfs2: gfs2_freeze_unlock cleanup

Function gfs2_freeze_unlock() is always called with &sdp->sd_freeze_gh
as its argument, so clean up the code by passing in sdp instead.

Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>

diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index db0df091a6a76c82e8d73c341742dc6e4a031a74..a9f7f0d44227971904397157e46566ebdbca73ce 100644 (file)
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -1289,7 +1289,7 @@ static int gfs2_fill_super(struct super_block *sb, struct fs_context *fc)
                error = gfs2_make_fs_rw(sdp);
 
        if (error) {
-               gfs2_freeze_unlock(&sdp->sd_freeze_gh);
+               gfs2_freeze_unlock(sdp);
                gfs2_destroy_threads(sdp);
                fs_err(sdp, "can't make FS RW: %d\n", error);
                goto fail_per_node;

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 32a37daaccbecd06d97e08b319523ff9b32af44f..713dd24082c9d16d628f509ff2f040742fa6838f 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -358,7 +358,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp)
                list_add(&lfcc->list, &list);
        }
 
-       gfs2_freeze_unlock(&sdp->sd_freeze_gh);
+       gfs2_freeze_unlock(sdp);
 
        error = gfs2_glock_nq_init(sdp->sd_freeze_gl, LM_ST_EXCLUSIVE,
                                   LM_FLAG_NOEXP | GL_NOPID,
@@ -382,7 +382,7 @@ static int gfs2_lock_fs_check_clean(struct gfs2_sbd *sdp)
        if (!error)
                goto out;  /* success */
 
-       gfs2_freeze_unlock(&sdp->sd_freeze_gh);
+       gfs2_freeze_unlock(sdp);
 
 relock_shared:
        error2 = gfs2_freeze_lock_shared(sdp);
@@ -621,7 +621,7 @@ restart:
 
        /*  Release stuff  */
 
-       gfs2_freeze_unlock(&sdp->sd_freeze_gh);
+       gfs2_freeze_unlock(sdp);
 
        iput(sdp->sd_jindex);
        iput(sdp->sd_statfs_inode);
@@ -707,7 +707,7 @@ void gfs2_freeze_func(struct work_struct *work)
        if (error)
                goto freeze_failed;
 
-       gfs2_freeze_unlock(&sdp->sd_freeze_gh);
+       gfs2_freeze_unlock(sdp);
        set_bit(SDF_FROZEN, &sdp->sd_flags);
 
        error = gfs2_do_thaw(sdp);
@@ -812,7 +812,7 @@ static int gfs2_thaw_super(struct super_block *sb, enum freeze_holder who)
        }
 
        atomic_inc(&sb->s_active);
-       gfs2_freeze_unlock(&sdp->sd_freeze_gh);
+       gfs2_freeze_unlock(sdp);
 
        error = gfs2_do_thaw(sdp);
 
@@ -833,7 +833,7 @@ void gfs2_thaw_freeze_initiator(struct super_block *sb)
        if (!test_bit(SDF_FREEZE_INITIATOR, &sdp->sd_flags))
                goto out;
 
-       gfs2_freeze_unlock(&sdp->sd_freeze_gh);
+       gfs2_freeze_unlock(sdp);
 
 out:
        mutex_unlock(&sdp->sd_freeze_mutex);

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index 09238604d741902c7635b29c61fa41a836284178..af4758d8d894cd30c29fa3d558c5955e4db30ac9 100644 (file)
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -109,10 +109,10 @@ int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp)
        return error;
 }
 
-void gfs2_freeze_unlock(struct gfs2_holder *freeze_gh)
+void gfs2_freeze_unlock(struct gfs2_sbd *sdp)
 {
-       if (gfs2_holder_initialized(freeze_gh))
-               gfs2_glock_dq_uninit(freeze_gh);
+       if (gfs2_holder_initialized(&sdp->sd_freeze_gh))
+               gfs2_glock_dq_uninit(&sdp->sd_freeze_gh);
 }
 
 static void signal_our_withdraw(struct gfs2_sbd *sdp)

diff --git a/fs/gfs2/util.h b/fs/gfs2/util.h
index d8d62bf0424d5985d6e1b4192ca270d83ce73834..27d03b641024185f518ac2f063bc9c8359e18178 100644 (file)
--- a/fs/gfs2/util.h
+++ b/fs/gfs2/util.h
@@ -150,7 +150,7 @@ int gfs2_io_error_i(struct gfs2_sbd *sdp, const char *function,
 int check_journal_clean(struct gfs2_sbd *sdp, struct gfs2_jdesc *jd,
                        bool verbose);
 int gfs2_freeze_lock_shared(struct gfs2_sbd *sdp);
-void gfs2_freeze_unlock(struct gfs2_holder *freeze_gh);
+void gfs2_freeze_unlock(struct gfs2_sbd *sdp);
 
 #define gfs2_io_error(sdp) \
 gfs2_io_error_i((sdp), __func__, __FILE__, __LINE__)