-#define i_mode i_ic.ic_mode
-#define i_nlink i_ic.ic_nlink
-#define i_uid i_ic.ic_uid
-#define i_gid i_ic.ic_gid
-#define i_size i_ic.ic_size
-#define i_db i_ic.ic_db
-#define i_ib i_ic.ic_ib
-#define i_atime i_ic.ic_atime
-#define i_mtime i_ic.ic_mtime
-#define i_ctime i_ic.ic_ctime
-#define i_rdev i_ic.ic_db[0]
-#define i_lastr i_un.if_lastr
-#define i_socket is_socket
-#define i_forw i_chain[0]
-#define i_back i_chain[1]
-#define i_freef i_un.i_fr.if_freef
-#define i_freeb i_un.i_fr.if_freeb
-
-#define di_ic di_un.di_icom
-#define di_mode di_ic.ic_mode
-#define di_nlink di_ic.ic_nlink
-#define di_uid di_ic.ic_uid
-#define di_gid di_ic.ic_gid
-#define di_size di_ic.ic_size
-#define di_db di_ic.ic_db
-#define di_ib di_ic.ic_ib
-#define di_atime di_ic.ic_atime
-#define di_mtime di_ic.ic_mtime
-#define di_ctime di_ic.ic_ctime
-#define di_rdev di_ic.ic_db[0]
-
-#ifdef KERNEL
-extern struct inode *inode; /* The inode table itself */
-extern struct inode *inodeNINODE; /* The end of the inode table */
-extern int ninode; /* number of slots in the table */
-
-struct inode *rootdir; /* pointer to inode of root directory */
-
-struct inode *ialloc();
-struct inode *ifind();
-struct inode *iget();
-struct inode *owner();
-struct inode *maknode();
-struct inode *namei();
-#endif
+#define i_mode i_din.di_mode
+#define i_nlink i_din.di_nlink
+#define i_uid i_din.di_uid
+#define i_gid i_din.di_gid
+#define i_size i_din.di_size
+#define i_db i_din.di_db
+#define i_ib i_din.di_ib
+#define i_atime i_din.di_atime
+#define i_mtime i_din.di_mtime
+#define i_ctime i_din.di_ctime
+#define i_blocks i_din.di_blocks
+#define i_rdev i_din.di_rdev
+#define i_shortlink i_din.di_shortlink
+#define i_flags i_din.di_flags
+#define i_gen i_din.di_gen