Merge branch 'master' into upstream

[sfrench/cifs-2.6.git] / fs / jfs / jfs_inode.h

diff --git a/fs/jfs/jfs_inode.h b/fs/jfs/jfs_inode.h
index c300726744641869b6e4f87794b2ece81d9b8280..1fc48df670c834f334f9620c4bd44c0a586145c7 100644 (file)
--- a/fs/jfs/jfs_inode.h
+++ b/fs/jfs/jfs_inode.h
@@ -32,8 +32,9 @@ extern void jfs_truncate_nolock(struct inode *, loff_t);
 extern void jfs_free_zero_link(struct inode *);
 extern struct dentry *jfs_get_parent(struct dentry *dentry);
 extern void jfs_set_inode_flags(struct inode *);
+extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
 
-extern struct address_space_operations jfs_aops;
+extern const struct address_space_operations jfs_aops;
 extern struct inode_operations jfs_dir_inode_operations;
 extern const struct file_operations jfs_dir_operations;
 extern struct inode_operations jfs_file_inode_operations;