nfsd: move most of nfsfh.h to fs/nfsd

[safe/jmp/linux-2.6] / fs / bfs / bfs.h

diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h
index 1fbc53f..7109e45 100644 (file)
--- a/fs/bfs/bfs.h
+++ b/fs/bfs/bfs.h
@@ -14,12 +14,11 @@ 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;
-       struct buffer_head * si_sbh;            /* buffer header w/superblock */
+       unsigned long *si_imap;
+       struct buffer_head *si_sbh;             /* buffer header w/superblock */
+       struct mutex bfs_lock;
 };
 
 /*
@@ -39,21 +38,23 @@ 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);
 }
 
 
 #define printf(format, args...) \
-       printk(KERN_ERR "BFS-fs: %s(): " format, __FUNCTION__, ## args)
+       printk(KERN_ERR "BFS-fs: %s(): " format, __func__, ## args)
 
+/* inode.c */
+extern struct inode *bfs_iget(struct super_block *sb, unsigned long ino);
 
 /* file.c */
-extern struct inode_operations bfs_file_inops;
-extern struct file_operations bfs_file_operations;
-extern struct address_space_operations bfs_aops;
+extern const struct inode_operations bfs_file_inops;
+extern const struct file_operations bfs_file_operations;
+extern const struct address_space_operations bfs_aops;
 
 /* dir.c */
-extern struct inode_operations bfs_dir_inops;
-extern struct file_operations bfs_dir_operations;
+extern const struct inode_operations bfs_dir_inops;
+extern const struct file_operations bfs_dir_operations;
 
 #endif /* _FS_BFS_BFS_H */