2 files changed, 6 insertions, 2 deletions

diff --git a/fs/nilfs2/mdt.c b/fs/nilfs2/mdt.c
index d01aff4957d9..ee943a342e1d 100644
--- a/fs/nilfs2/mdt.c
+++ b/fs/nilfs2/mdt.c
@@ -577,7 +577,5 @@ void nilfs_mdt_destroy(struct inode *inode)
                 nilfs_palloc_destroy_cache(inode);
         nilfs_mdt_clear(inode);
 
-        kfree(mdi->mi_bgl); /* kfree(NULL) is safe */
-        kfree(mdi);
         nilfs_destroy_inode(inode);
 }
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c
index 9f4913f78408..51576b4dbf7a 100644
--- a/fs/nilfs2/super.c
+++ b/fs/nilfs2/super.c
@@ -167,6 +167,12 @@ struct inode *nilfs_alloc_inode(struct super_block *sb)
 
 void nilfs_destroy_inode(struct inode *inode)
 {
+        struct nilfs_mdt_info *mdi = NILFS_MDT(inode);
+
+        if (mdi) {
+                kfree(mdi->mi_bgl); /* kfree(NULL) is safe */
+                kfree(mdi);
+        }
         kmem_cache_free(nilfs_inode_cachep, NILFS_I(inode));
 }