Skip to content

Commit 6ecf2f0

Browse files
committed
gfs2: Rename the {freeze,thaw}_super callbacks
jira LE-1907 Rebuild_History Non-Buildable kernel-4.18.0-477.27.1.el8_8 commit-author Andreas Gruenbacher <agruenba@redhat.com> commit 097cca5 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> (cherry picked from commit 097cca5) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent 3fc480d commit 6ecf2f0

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

fs/gfs2/super.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -707,12 +707,12 @@ void gfs2_freeze_func(struct work_struct *work)
707707
}
708708

709709
/**
710-
* gfs2_freeze - prevent further writes to the filesystem
710+
* gfs2_freeze_super - prevent further writes to the filesystem
711711
* @sb: the VFS structure for the filesystem
712712
*
713713
*/
714714

715-
static int gfs2_freeze(struct super_block *sb)
715+
static int gfs2_freeze_super(struct super_block *sb)
716716
{
717717
struct gfs2_sbd *sdp = sb->s_fs_info;
718718
int error;
@@ -752,12 +752,12 @@ static int gfs2_freeze(struct super_block *sb)
752752
}
753753

754754
/**
755-
* gfs2_unfreeze - reallow writes to the filesystem
755+
* gfs2_thaw_super - reallow writes to the filesystem
756756
* @sb: the VFS structure for the filesystem
757757
*
758758
*/
759759

760-
static int gfs2_unfreeze(struct super_block *sb)
760+
static int gfs2_thaw_super(struct super_block *sb)
761761
{
762762
struct gfs2_sbd *sdp = sb->s_fs_info;
763763

@@ -1530,8 +1530,8 @@ const struct super_operations gfs2_super_ops = {
15301530
.evict_inode = gfs2_evict_inode,
15311531
.put_super = gfs2_put_super,
15321532
.sync_fs = gfs2_sync_fs,
1533-
.freeze_super = gfs2_freeze,
1534-
.thaw_super = gfs2_unfreeze,
1533+
.freeze_super = gfs2_freeze_super,
1534+
.thaw_super = gfs2_thaw_super,
15351535
.statfs = gfs2_statfs,
15361536
.drop_inode = gfs2_drop_inode,
15371537
.show_options = gfs2_show_options,

fs/gfs2/util.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ static void signal_our_withdraw(struct gfs2_sbd *sdp)
189189
sdp->sd_jinode_gh.gh_flags |= GL_NOCACHE;
190190
gfs2_glock_dq(&sdp->sd_jinode_gh);
191191
if (test_bit(SDF_FS_FROZEN, &sdp->sd_flags)) {
192-
/* Make sure gfs2_unfreeze works if partially-frozen */
192+
/* Make sure gfs2_thaw_super works if partially-frozen */
193193
flush_work(&sdp->sd_freeze_work);
194194
atomic_set(&sdp->sd_freeze_state, SFS_FROZEN);
195195
thaw_super(sdp->sd_vfs);

0 commit comments

Comments
 (0)