gfs2: Rename the {freeze,thaw}_super callbacks

Rename gfs2_freeze to gfs2_freeze_super and gfs2_unfreeze to
gfs2_thaw_super to match the names of the corresponding super
operations.

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

diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c
index 6afd290798439a01c69f3b1ee271a3df8322b079..bfaeef04a4f7288b212f7a21d15fe92ecb7d3a1d 100644 (file)
--- a/fs/gfs2/super.c
+++ b/fs/gfs2/super.c
@@ -697,12 +697,12 @@ void gfs2_freeze_func(struct work_struct *work)
 }
 
 /**
- * gfs2_freeze - prevent further writes to the filesystem
+ * gfs2_freeze_super - prevent further writes to the filesystem
  * @sb: the VFS structure for the filesystem
  *
  */
 
-static int gfs2_freeze(struct super_block *sb)
+static int gfs2_freeze_super(struct super_block *sb)
 {
        struct gfs2_sbd *sdp = sb->s_fs_info;
        int error;
@@ -742,12 +742,12 @@ out:
 }
 
 /**
- * gfs2_unfreeze - reallow writes to the filesystem
+ * gfs2_thaw_super - reallow writes to the filesystem
  * @sb: the VFS structure for the filesystem
  *
  */
 
-static int gfs2_unfreeze(struct super_block *sb)
+static int gfs2_thaw_super(struct super_block *sb)
 {
        struct gfs2_sbd *sdp = sb->s_fs_info;
 
@@ -1530,8 +1530,8 @@ const struct super_operations gfs2_super_ops = {
        .evict_inode            = gfs2_evict_inode,
        .put_super              = gfs2_put_super,
        .sync_fs                = gfs2_sync_fs,
-       .freeze_super           = gfs2_freeze,
-       .thaw_super             = gfs2_unfreeze,
+       .freeze_super           = gfs2_freeze_super,
+       .thaw_super             = gfs2_thaw_super,
        .statfs                 = gfs2_statfs,
        .drop_inode             = gfs2_drop_inode,
        .show_options           = gfs2_show_options,

diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c
index c84242ef4903587f53e227486642852e0b9f3c14..16ac3b3e7b885e6457e7ea32c27cfbe4d1ba8b01 100644 (file)
--- a/fs/gfs2/util.c
+++ b/fs/gfs2/util.c
@@ -188,7 +188,7 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp)
        sdp->sd_jinode_gh.gh_flags |= GL_NOCACHE;
        gfs2_glock_dq(&sdp->sd_jinode_gh);
        if (test_bit(SDF_FS_FROZEN, &sdp->sd_flags)) {
-               /* Make sure gfs2_unfreeze works if partially-frozen */
+               /* Make sure gfs2_thaw_super works if partially-frozen */
                flush_work(&sdp->sd_freeze_work);
                atomic_set(&sdp->sd_freeze_state, SFS_FROZEN);
                thaw_super(sdp->sd_vfs);