diff --git a/fs/jfs/super.c b/fs/jfs/super.c
index 2e2f7f6d36a0..a9a13b4da6f4 100644
--- a/fs/jfs/super.c
+++ b/fs/jfs/super.c
@@ -113,6 +113,8 @@ static struct inode *jfs_alloc_inode(struct super_block *sb)
 
 static void jfs_free_inode(struct inode *inode)
 {
+	if (JFS_IP(inode)->fileset == FILESYSTEM_I)
+		JFS_SBI(inode->i_sb)->ipimap = NULL;
 	kmem_cache_free(jfs_inode_cachep, JFS_IP(inode));
 }