V4L/DVB (13798): [Mantis] Enable power for all cards, use byte mode only on relevant...

[safe/jmp/linux-2.6] / fs / ext2 / xip.c

diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c
index 4fb94c2..322a56b 100644 (file)
--- a/fs/ext2/xip.c
+++ b/fs/ext2/xip.c
@@ -11,6 +11,7 @@
 #include <linux/buffer_head.h>
 #include <linux/ext2_fs_sb.h>
 #include <linux/ext2_fs.h>
+#include <linux/blkdev.h>
 #include "ext2.h"
 #include "xip.h"
 
@@ -19,7 +20,7 @@ __inode_direct_access(struct inode *inode, sector_t block,
                      void **kaddr, unsigned long *pfn)
 {
        struct block_device *bdev = inode->i_sb->s_bdev;
-       struct block_device_operations *ops = bdev->bd_disk->fops;
+       const struct block_device_operations *ops = bdev->bd_disk->fops;
        sector_t sector;
 
        sector = block * (PAGE_SIZE / 512); /* ext2 block to bdev sector */
@@ -68,8 +69,9 @@ void ext2_xip_verify_sb(struct super_block *sb)
        if ((sbi->s_mount_opt & EXT2_MOUNT_XIP) &&
            !sb->s_bdev->bd_disk->fops->direct_access) {
                sbi->s_mount_opt &= (~EXT2_MOUNT_XIP);
-               ext2_warning(sb, __func__,
-                            "ignoring xip option - not supported by bdev");
+               ext2_msg(sb, KERN_WARNING,
+                            "warning: ignoring xip option - "
+                            "not supported by bdev");
        }
 }