3 files changed, 10 insertions, 10 deletions

diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 5bcc04e82c28..9069afbad9d3 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -483,9 +483,9 @@ static int idescsi_ide_ioctl(struct inode *inode, struct file *file,
 
 static struct block_device_operations idescsi_ops = {
         .owner          = THIS_MODULE,
-        .open           = idescsi_ide_open,
-        .release        = idescsi_ide_release,
-        .ioctl          = idescsi_ide_ioctl,
+        .__open         = idescsi_ide_open,
+        .__release      = idescsi_ide_release,
+        .__ioctl                = idescsi_ide_ioctl,
 };
 
 static int idescsi_slave_configure(struct scsi_device * sdp)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5a18528a69d0..c8b95e8d2859 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -962,12 +962,12 @@ static long sd_compat_ioctl(struct file *file, unsigned int cmd, unsigned long a
 
 static struct block_device_operations sd_fops = {
         .owner                  = THIS_MODULE,
-        .open                   = sd_open,
-        .release                = sd_release,
-        .ioctl                  = sd_ioctl,
+        .__open                 = sd_open,
+        .__release              = sd_release,
+        .__ioctl                        = sd_ioctl,
         .getgeo                 = sd_getgeo,
 #ifdef CONFIG_COMPAT
-        .compat_ioctl           = sd_compat_ioctl,
+        .__compat_ioctl         = sd_compat_ioctl,
 #endif
         .media_changed          = sd_media_changed,
         .revalidate_disk        = sd_revalidate_disk,
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index 2fb8d4d2d6f6..9446cbf4de84 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -540,9 +540,9 @@ static int sr_block_media_changed(struct gendisk *disk)
 static struct block_device_operations sr_bdops =
 {
         .owner          = THIS_MODULE,
-        .open           = sr_block_open,
-        .release        = sr_block_release,
-        .ioctl          = sr_block_ioctl,
+        .__open         = sr_block_open,
+        .__release      = sr_block_release,
+        .__ioctl                = sr_block_ioctl,
         .media_changed  = sr_block_media_changed,
         /* 
          * No compat_ioctl for now because sr_block_ioctl never