Merge branch 'pm-opp'

[linux-2.6-microblaze.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index 6290c3a..bd6a9e9 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -1912,7 +1912,7 @@ EXPORT_SYMBOL(page_zero_new_buffers);
 
 static void
 iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh,
-               struct iomap *iomap)
+               const struct iomap *iomap)
 {
        loff_t offset = block << inode->i_blkbits;
 
@@ -1966,7 +1966,7 @@ iomap_to_bh(struct inode *inode, sector_t block, struct buffer_head *bh,
 }
 
 int __block_write_begin_int(struct page *page, loff_t pos, unsigned len,
-               get_block_t *get_block, struct iomap *iomap)
+               get_block_t *get_block, const struct iomap *iomap)
 {
        unsigned from = pos & (PAGE_SIZE - 1);
        unsigned to = from + len;