2.6.24

 fs

 bfs

diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h
index 130f6c6..ac7a8b1 100644
--- a/fs/bfs/bfs.h
+++ b/fs/bfs/bfs.h
@@ -14,8 +14,6 @@ struct bfs_sb_info {
    unsigned long si_blocks;
    unsigned long si_freeb;
    unsigned long si_freei;
-   unsigned long si_lf_ioff;
-   unsigned long si_lf_sblk;
    unsigned long si_lf_eblk;
    unsigned long si_lasti;
    unsigned long * si_imap;
@@ -39,7 +37,7 @@ static inline struct bfs_sb_info *BFS_SB(struct super_block *sb)
 
 static inline struct bfs_inode_info *BFS_I(struct inode *inode)
 {
-   return list_entry(inode, struct bfs_inode_info, vfs_inode);
+   return container_of(inode, struct bfs_inode_info, vfs_inode);
 }