Merge commit 'v2.6.28-rc4' into timers/rtc

Conflicts:
	drivers/rtc/rtc-cmos.c

1 files changed, 7 insertions, 8 deletions

diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 1a50ae70f716..b220c686089d 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -156,11 +156,10 @@ static int blkif_getgeo(struct block_device *bd, struct hd_geometry *hg)
         return 0;
 }
 
-static int blkif_ioctl(struct inode *inode, struct file *filep,
+static int blkif_ioctl(struct block_device *bdev, fmode_t mode,
                        unsigned command, unsigned long argument)
 {
-        struct blkfront_info *info =
-                inode->i_bdev->bd_disk->private_data;
+        struct blkfront_info *info = bdev->bd_disk->private_data;
         int i;
 
         dev_dbg(&info->xbdev->dev, "command: 0x%x, argument: 0x%lx\n",
@@ -1014,16 +1013,16 @@ static int blkfront_is_ready(struct xenbus_device *dev)
         return info->is_ready;
 }
 
-static int blkif_open(struct inode *inode, struct file *filep)
+static int blkif_open(struct block_device *bdev, fmode_t mode)
 {
-        struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
+        struct blkfront_info *info = bdev->bd_disk->private_data;
         info->users++;
         return 0;
 }
 
-static int blkif_release(struct inode *inode, struct file *filep)
+static int blkif_release(struct gendisk *disk, fmode_t mode)
 {
-        struct blkfront_info *info = inode->i_bdev->bd_disk->private_data;
+        struct blkfront_info *info = disk->private_data;
         info->users--;
         if (info->users == 0) {
                 /* Check whether we have been instructed to close.  We will
@@ -1044,7 +1043,7 @@ static struct block_device_operations xlvbd_block_fops =
         .open = blkif_open,
         .release = blkif_release,
         .getgeo = blkif_getgeo,
-        .ioctl = blkif_ioctl,
+        .locked_ioctl = blkif_ioctl,
 };