Merge branch 'master' into 85xx

[mv-sheeva.git] / fs / bfs / bfs.h

diff --git a/fs/bfs/bfs.h b/fs/bfs/bfs.h
index 1020dbc88bec0b5cc545b0de22d9dff4c0cd67c1..130f6c66c5ba09dab89de3b7865ac09a6c96ae25 100644 (file)
--- a/fs/bfs/bfs.h
+++ b/fs/bfs/bfs.h
@@ -20,7 +20,6 @@ struct bfs_sb_info {
        unsigned long si_lasti;
        unsigned long * si_imap;
        struct buffer_head * si_sbh;            /* buffer header w/superblock */
-       struct bfs_super_block * si_bfs_sb;     /* superblock in si_sbh->b_data */
 };
 
 /*
@@ -49,12 +48,12 @@ static inline struct bfs_inode_info *BFS_I(struct inode *inode)
 
 
 /* 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 */