diff options
| -rw-r--r-- | fs/gfs2/super.c | 14 | ||||
| -rw-r--r-- | fs/gfs2/super.h | 1 | ||||
| -rw-r--r-- | fs/gfs2/util.c | 7 |
3 files changed, 0 insertions, 22 deletions
diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 0c398866dbb4..f6cd907b3ec6 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -817,20 +817,6 @@ static int gfs2_thaw_super(struct super_block *sb, enum freeze_holder who, return error; } -void gfs2_thaw_freeze_initiator(struct super_block *sb) -{ - struct gfs2_sbd *sdp = sb->s_fs_info; - - mutex_lock(&sdp->sd_freeze_mutex); - if (!test_bit(SDF_FREEZE_INITIATOR, &sdp->sd_flags)) - goto out; - - gfs2_freeze_unlock(sdp); - -out: - mutex_unlock(&sdp->sd_freeze_mutex); -} - /** * statfs_slow_fill - fill in the sg for a given RG * @rgd: the RG diff --git a/fs/gfs2/super.h b/fs/gfs2/super.h index b27a774d9580..173f1e74c2a9 100644 --- a/fs/gfs2/super.h +++ b/fs/gfs2/super.h @@ -47,7 +47,6 @@ void gfs2_statfs_change_out(const struct gfs2_statfs_change_host *sc, void update_statfs(struct gfs2_sbd *sdp, struct buffer_head *m_bh); int gfs2_statfs_sync(struct super_block *sb, int type); void gfs2_freeze_func(struct work_struct *work); -void gfs2_thaw_freeze_initiator(struct super_block *sb); void free_local_statfs_inodes(struct gfs2_sbd *sdp); struct inode *find_local_statfs_inode(struct gfs2_sbd *sdp, diff --git a/fs/gfs2/util.c b/fs/gfs2/util.c index ff63070ed6de..b8ce04338b24 100644 --- a/fs/gfs2/util.c +++ b/fs/gfs2/util.c @@ -131,8 +131,6 @@ static void do_withdraw(struct gfs2_sbd *sdp) */ clear_bit(SDF_JOURNAL_LIVE, &sdp->sd_flags); if (!sb_rdonly(sdp->sd_vfs)) { - bool locked = mutex_trylock(&sdp->sd_freeze_mutex); - wake_up(&sdp->sd_logd_waitq); wake_up(&sdp->sd_quota_wait); @@ -142,17 +140,12 @@ static void do_withdraw(struct gfs2_sbd *sdp) sdp->sd_vfs->s_flags |= SB_RDONLY; - if (locked) - mutex_unlock(&sdp->sd_freeze_mutex); - /* * Dequeue any pending non-system glock holders that can no * longer be granted because the file system is withdrawn. */ gfs2_withdraw_glocks(sdp); } - - gfs2_thaw_freeze_initiator(sdp->sd_vfs); } void gfs2_lm(struct gfs2_sbd *sdp, const char *fmt, ...) |