22 files changed, 53 insertions, 53 deletions

diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c
index a002a381df92..4b90ebfa6676 100644
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.c
@@ -153,7 +153,7 @@ static int DAC960_revalidate_disk(struct gendisk *disk)
 
 static struct block_device_operations DAC960_BlockDeviceOperations = {
         .owner                  = THIS_MODULE,
-        .open                   = DAC960_open,
+        .__open                 = DAC960_open,
         .getgeo                 = DAC960_getgeo,
         .media_changed          = DAC960_media_changed,
         .revalidate_disk        = DAC960_revalidate_disk,
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c
index d19c5a939fe8..d5da4e3cb2ad 100644
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
@@ -1648,9 +1648,9 @@ static int amiga_floppy_change(struct gendisk *disk)
 
 static struct block_device_operations floppy_fops = {
         .owner          = THIS_MODULE,
-        .open           = floppy_open,
-        .release        = floppy_release,
-        .ioctl          = fd_ioctl,
+        .__open         = floppy_open,
+        .__release      = floppy_release,
+        .__ioctl                = fd_ioctl,
         .getgeo         = fd_getgeo,
         .media_changed  = amiga_floppy_change,
 };
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index d876ad861237..d4d9796d5ddd 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -239,8 +239,8 @@ aoeblk_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 }
 
 static struct block_device_operations aoe_bdops = {
-        .open = aoeblk_open,
-        .release = aoeblk_release,
+        .__open = aoeblk_open,
+        .__release = aoeblk_release,
         .getgeo = aoeblk_getgeo,
         .owner = THIS_MODULE,
 };
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index 85d56a26f7c6..30166774327d 100644
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1857,9 +1857,9 @@ static int floppy_release( struct inode * inode, struct file * filp )
 
 static struct block_device_operations floppy_fops = {
         .owner          = THIS_MODULE,
-        .open           = floppy_open,
-        .release        = floppy_release,
-        .ioctl          = fd_ioctl,
+        .__open         = floppy_open,
+        .__release      = floppy_release,
+        .__ioctl                = fd_ioctl,
         .media_changed  = check_floppy_change,
         .revalidate_disk= floppy_revalidate,
 };
diff --git a/drivers/block/brd.c b/drivers/block/brd.c
index d070d492e385..2ea99f947667 100644
--- a/drivers/block/brd.c
+++ b/drivers/block/brd.c
@@ -376,7 +376,7 @@ static int brd_ioctl(struct inode *inode, struct file *file,
 
 static struct block_device_operations brd_fops = {
         .owner =                THIS_MODULE,
-        .ioctl =                brd_ioctl,
+        .__ioctl =              brd_ioctl,
 #ifdef CONFIG_BLK_DEV_XIP
         .direct_access =        brd_direct_access,
 #endif
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index d9b1c15b8113..781b745181d2 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -197,12 +197,12 @@ static long cciss_compat_ioctl(struct file *f, unsigned cmd, unsigned long arg);
 
 static struct block_device_operations cciss_fops = {
         .owner = THIS_MODULE,
-        .open = cciss_open,
-        .release = cciss_release,
-        .ioctl = cciss_ioctl,
+        .__open = cciss_open,
+        .__release = cciss_release,
+        .__ioctl = cciss_ioctl,
         .getgeo = cciss_getgeo,
 #ifdef CONFIG_COMPAT
-        .compat_ioctl = cciss_compat_ioctl,
+        .__compat_ioctl = cciss_compat_ioctl,
 #endif
         .revalidate_disk = cciss_revalidate,
 };
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 3d967525e9a9..b71334b968b6 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -195,9 +195,9 @@ static inline ctlr_info_t *get_host(struct gendisk *disk)
 
 static struct block_device_operations ida_fops  = {
         .owner          = THIS_MODULE,
-        .open           = ida_open,
-        .release        = ida_release,
-        .ioctl          = ida_ioctl,
+        .__open         = ida_open,
+        .__release      = ida_release,
+        .__ioctl                = ida_ioctl,
         .getgeo         = ida_getgeo,
         .revalidate_disk= ida_revalidate,
 };
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 5d60c05a736a..72363df58953 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3902,9 +3902,9 @@ static int floppy_revalidate(struct gendisk *disk)
 
 static struct block_device_operations floppy_fops = {
         .owner                  = THIS_MODULE,
-        .open                   = floppy_open,
-        .release                = floppy_release,
-        .ioctl                  = fd_ioctl,
+        .__open                 = floppy_open,
+        .__release              = floppy_release,
+        .__ioctl                        = fd_ioctl,
         .getgeo                 = fd_getgeo,
         .media_changed          = check_floppy_change,
         .revalidate_disk        = floppy_revalidate,
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index d3a25b027ff9..6faca2b7ae37 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -1355,11 +1355,11 @@ static int lo_release(struct inode *inode, struct file *file)
 
 static struct block_device_operations lo_fops = {
         .owner =        THIS_MODULE,
-        .open =         lo_open,
-        .release =      lo_release,
-        .ioctl =        lo_ioctl,
+        .__open =               lo_open,
+        .__release =    lo_release,
+        .__ioctl =      lo_ioctl,
 #ifdef CONFIG_COMPAT
-        .compat_ioctl = lo_compat_ioctl,
+        .__compat_ioctl =       lo_compat_ioctl,
 #endif
 };
 
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c
index 9034ca585afd..36015e0945b1 100644
--- a/drivers/block/nbd.c
+++ b/drivers/block/nbd.c
@@ -691,7 +691,7 @@ static int nbd_ioctl(struct inode *inode, struct file *file,
 static struct block_device_operations nbd_fops =
 {
         .owner =        THIS_MODULE,
-        .ioctl =        nbd_ioctl,
+        .__ioctl =      nbd_ioctl,
 };
 
 /*
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c
index 8bd557e2a659..6e6dcc1d4328 100644
--- a/drivers/block/paride/pcd.c
+++ b/drivers/block/paride/pcd.c
@@ -252,9 +252,9 @@ static int pcd_block_media_changed(struct gendisk *disk)
 
 static struct block_device_operations pcd_bdops = {
         .owner          = THIS_MODULE,
-        .open           = pcd_block_open,
-        .release        = pcd_block_release,
-        .ioctl          = pcd_block_ioctl,
+        .__open         = pcd_block_open,
+        .__release      = pcd_block_release,
+        .__ioctl                = pcd_block_ioctl,
         .media_changed  = pcd_block_media_changed,
 };
 
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c
index 5fdfa7c888ce..b3023844947c 100644
--- a/drivers/block/paride/pd.c
+++ b/drivers/block/paride/pd.c
@@ -807,9 +807,9 @@ static int pd_revalidate(struct gendisk *p)
 
 static struct block_device_operations pd_fops = {
         .owner          = THIS_MODULE,
-        .open           = pd_open,
-        .release        = pd_release,
-        .ioctl          = pd_ioctl,
+        .__open         = pd_open,
+        .__release      = pd_release,
+        .__ioctl                = pd_ioctl,
         .getgeo         = pd_getgeo,
         .media_changed  = pd_check_media,
         .revalidate_disk= pd_revalidate
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c
index a902d84fd330..e08ca5161ad8 100644
--- a/drivers/block/paride/pf.c
+++ b/drivers/block/paride/pf.c
@@ -264,9 +264,9 @@ static char *pf_buf;		/* buffer for request in progress */
 
 static struct block_device_operations pf_fops = {
         .owner          = THIS_MODULE,
-        .open           = pf_open,
-        .release        = pf_release,
-        .ioctl          = pf_ioctl,
+        .__open         = pf_open,
+        .__release      = pf_release,
+        .__ioctl                = pf_ioctl,
         .getgeo         = pf_getgeo,
         .media_changed  = pf_check_media,
 };
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c
index a0ba4023953b..33ac8ddf4912 100644
--- a/drivers/block/pktcdvd.c
+++ b/drivers/block/pktcdvd.c
@@ -2847,9 +2847,9 @@ static int pkt_media_changed(struct gendisk *disk)
 
 static struct block_device_operations pktcdvd_ops = {
         .owner =                THIS_MODULE,
-        .open =                 pkt_open,
-        .release =              pkt_close,
-        .ioctl =                pkt_ioctl,
+        .__open =                       pkt_open,
+        .__release =            pkt_close,
+        .__ioctl =              pkt_ioctl,
         .media_changed =        pkt_media_changed,
 };
 
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 5c45d5556ae8..9398af86a7aa 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -998,9 +998,9 @@ static int floppy_revalidate(struct gendisk *disk)
 }
 
 static struct block_device_operations floppy_fops = {
-        .open           = floppy_open,
-        .release        = floppy_release,
-        .ioctl          = floppy_ioctl,
+        .__open         = floppy_open,
+        .__release      = floppy_release,
+        .__ioctl                = floppy_ioctl,
         .media_changed  = floppy_check_change,
         .revalidate_disk= floppy_revalidate,
 };
diff --git a/drivers/block/ub.c b/drivers/block/ub.c
index bc04330f3683..5261773407da 100644
--- a/drivers/block/ub.c
+++ b/drivers/block/ub.c
@@ -1791,9 +1791,9 @@ static int ub_bd_media_changed(struct gendisk *disk)
 
 static struct block_device_operations ub_bd_fops = {
         .owner          = THIS_MODULE,
-        .open           = ub_bd_open,
-        .release        = ub_bd_release,
-        .ioctl          = ub_bd_ioctl,
+        .__open         = ub_bd_open,
+        .__release      = ub_bd_release,
+        .__ioctl                = ub_bd_ioctl,
         .media_changed  = ub_bd_media_changed,
         .revalidate_disk = ub_bd_revalidate,
 };
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c
index 1730d29e6044..7f7beec29ebb 100644
--- a/drivers/block/viodasd.c
+++ b/drivers/block/viodasd.c
@@ -221,8 +221,8 @@ static int viodasd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
  */
 static struct block_device_operations viodasd_fops = {
         .owner = THIS_MODULE,
-        .open = viodasd_open,
-        .release = viodasd_release,
+        .__open = viodasd_open,
+        .__release = viodasd_release,
         .getgeo = viodasd_getgeo,
 };
 
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c
index 7643cd16fd67..10f157ea7b0b 100644
--- a/drivers/block/virtio_blk.c
+++ b/drivers/block/virtio_blk.c
@@ -180,7 +180,7 @@ static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo)
 }
 
 static struct block_device_operations virtblk_fops = {
-        .ioctl  = virtblk_ioctl,
+        .__ioctl  = virtblk_ioctl,
         .owner  = THIS_MODULE,
         .getgeo = virtblk_getgeo,
 };
diff --git a/drivers/block/xd.c b/drivers/block/xd.c
index 624d30f7da3f..316fa1da4b9c 100644
--- a/drivers/block/xd.c
+++ b/drivers/block/xd.c
@@ -132,7 +132,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo);
 
 static struct block_device_operations xd_fops = {
         .owner  = THIS_MODULE,
-        .ioctl  = xd_ioctl,
+        .__ioctl        = xd_ioctl,
         .getgeo = xd_getgeo,
 };
 static DECLARE_WAIT_QUEUE_HEAD(xd_wait_int);
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c
index 1a50ae70f716..7efac80c8dde 100644
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
@@ -1041,8 +1041,8 @@ static int blkif_release(struct inode *inode, struct file *filep)
 static struct block_device_operations xlvbd_block_fops =
 {
         .owner = THIS_MODULE,
-        .open = blkif_open,
-        .release = blkif_release,
+        .__open = blkif_open,
+        .__release = blkif_release,
         .getgeo = blkif_getgeo,
         .ioctl = blkif_ioctl,
 };
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index 4a7a059ebaf7..e4efe5b7ec22 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -919,8 +919,8 @@ static int ace_getgeo(struct block_device *bdev, struct hd_geometry *geo)
 
 static struct block_device_operations ace_fops = {
         .owner = THIS_MODULE,
-        .open = ace_open,
-        .release = ace_release,
+        .__open = ace_open,
+        .__release = ace_release,
         .media_changed = ace_media_changed,
         .revalidate_disk = ace_revalidate_disk,
         .getgeo = ace_getgeo,
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c
index be20a67f1fa8..4860d0f36870 100644
--- a/drivers/block/z2ram.c
+++ b/drivers/block/z2ram.c
@@ -314,8 +314,8 @@ z2_release( struct inode *inode, struct file *filp )
 static struct block_device_operations z2_fops =
 {
         .owner          = THIS_MODULE,
-        .open           = z2_open,
-        .release        = z2_release,
+        .__open         = z2_open,
+        .__release      = z2_release,
 };
 
 static struct kobject *z2_find(dev_t dev, int *part, void *data)