--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -66,6 +66,8 @@ void free_sbd(struct gfs2_sbd *sdp)
 {
        struct super_block *sb = sdp->sd_vfs;
 
+       /* Wait for rcu_call(gfs2_qd_dealloc) */
+       rcu_barrier();
        free_percpu(sdp->sd_lkstats);
        sb->s_fs_info = NULL;
        kfree(sdp);