diff options
author | Bob Peterson <rpeterso@redhat.com> | 2017-07-28 07:22:55 -0500 |
---|---|---|
committer | Bob Peterson <rpeterso@redhat.com> | 2017-08-09 09:36:39 -0500 |
commit | b2fb7dab7f193909e9a0ad489a91666b8c55eff1 (patch) | |
tree | 4fa06251beb04159500422caf2cca0f0c2b9ffa2 /fs/gfs2 | |
parent | 645ebd49f0583f91234aa043ef71ddebe7e8351e (diff) | |
download | linux-stable-b2fb7dab7f193909e9a0ad489a91666b8c55eff1.tar.gz linux-stable-b2fb7dab7f193909e9a0ad489a91666b8c55eff1.tar.bz2 linux-stable-b2fb7dab7f193909e9a0ad489a91666b8c55eff1.zip |
GFS2: Delete debugfs files only after we evict the glocks
This patch moves the call to gfs2_delete_debugfs_file so that it
comes after the glock hash table has been cleared. This way we
can query the debugfs files if umount hangs.
Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2')
-rw-r--r-- | fs/gfs2/ops_fstype.c | 1 | ||||
-rw-r--r-- | fs/gfs2/super.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index e76058d34b74..51752de54f11 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c @@ -1388,7 +1388,6 @@ static void gfs2_kill_sb(struct super_block *sb) sdp->sd_root_dir = NULL; sdp->sd_master_dir = NULL; shrink_dcache_sb(sb); - gfs2_delete_debugfs_file(sdp); free_percpu(sdp->sd_lkstats); kill_block_super(sb); } diff --git a/fs/gfs2/super.c b/fs/gfs2/super.c index 87271a859a8d..1918bb5fc943 100644 --- a/fs/gfs2/super.c +++ b/fs/gfs2/super.c @@ -924,6 +924,7 @@ restart: gfs2_jindex_free(sdp); /* Take apart glock structures and buffer lists */ gfs2_gl_hash_clear(sdp); + gfs2_delete_debugfs_file(sdp); /* Unmount the locking protocol */ gfs2_lm_unmount(sdp); |