const: make block_device_operations const Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c index a477991..88f4ae7 100644 --- a/arch/powerpc/sysdev/axonram.c +++ b/arch/powerpc/sysdev/axonram.c
@@ -165,7 +165,7 @@ return 0; } -static struct block_device_operations axon_ram_devops = { +static const struct block_device_operations axon_ram_devops = { .owner = THIS_MODULE, .direct_access = axon_ram_direct_access };
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c index 8f05d4d..635d16d 100644 --- a/arch/um/drivers/ubd_kern.c +++ b/arch/um/drivers/ubd_kern.c
@@ -106,7 +106,7 @@ #define MAX_DEV (16) -static struct block_device_operations ubd_blops = { +static const struct block_device_operations ubd_blops = { .owner = THIS_MODULE, .open = ubd_open, .release = ubd_release,
diff --git a/drivers/block/DAC960.c b/drivers/block/DAC960.c index 1e6b7c1..8b50af3 100644 --- a/drivers/block/DAC960.c +++ b/drivers/block/DAC960.c
@@ -152,7 +152,7 @@ return 0; } -static struct block_device_operations DAC960_BlockDeviceOperations = { +static const struct block_device_operations DAC960_BlockDeviceOperations = { .owner = THIS_MODULE, .open = DAC960_open, .getgeo = DAC960_getgeo,
diff --git a/drivers/block/amiflop.c b/drivers/block/amiflop.c index 2f07b7c..0552258 100644 --- a/drivers/block/amiflop.c +++ b/drivers/block/amiflop.c
@@ -1632,7 +1632,7 @@ return 0; } -static struct block_device_operations floppy_fops = { +static const struct block_device_operations floppy_fops = { .owner = THIS_MODULE, .open = floppy_open, .release = floppy_release,
diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c index b6cd571..3af97d4 100644 --- a/drivers/block/aoe/aoeblk.c +++ b/drivers/block/aoe/aoeblk.c
@@ -237,7 +237,7 @@ return 0; } -static struct block_device_operations aoe_bdops = { +static const struct block_device_operations aoe_bdops = { .open = aoeblk_open, .release = aoeblk_release, .getgeo = aoeblk_getgeo,
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 3ff0294..847a9e5 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c
@@ -1856,7 +1856,7 @@ return 0; } -static struct block_device_operations floppy_fops = { +static const struct block_device_operations floppy_fops = { .owner = THIS_MODULE, .open = floppy_open, .release = floppy_release,
diff --git a/drivers/block/brd.c b/drivers/block/brd.c index 4bf8705..4f68843 100644 --- a/drivers/block/brd.c +++ b/drivers/block/brd.c
@@ -375,7 +375,7 @@ return error; } -static struct block_device_operations brd_fops = { +static const struct block_device_operations brd_fops = { .owner = THIS_MODULE, .locked_ioctl = brd_ioctl, #ifdef CONFIG_BLK_DEV_XIP
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c index d8372b4..4f19105 100644 --- a/drivers/block/cciss.c +++ b/drivers/block/cciss.c
@@ -205,7 +205,7 @@ unsigned, unsigned long); #endif -static struct block_device_operations cciss_fops = { +static const struct block_device_operations cciss_fops = { .owner = THIS_MODULE, .open = cciss_open, .release = cciss_release,
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c index 44fa201..b82d438 100644 --- a/drivers/block/cpqarray.c +++ b/drivers/block/cpqarray.c
@@ -193,7 +193,7 @@ } -static struct block_device_operations ida_fops = { +static const struct block_device_operations ida_fops = { .owner = THIS_MODULE, .open = ida_open, .release = ida_release,
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 2b387c2..5c01f74 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c
@@ -3907,7 +3907,7 @@ return res; } -static struct block_device_operations floppy_fops = { +static const struct block_device_operations floppy_fops = { .owner = THIS_MODULE, .open = floppy_open, .release = floppy_release,
diff --git a/drivers/block/hd.c b/drivers/block/hd.c index f9d0160..d5cdce0 100644 --- a/drivers/block/hd.c +++ b/drivers/block/hd.c
@@ -692,7 +692,7 @@ return IRQ_HANDLED; } -static struct block_device_operations hd_fops = { +static const struct block_device_operations hd_fops = { .getgeo = hd_getgeo, };
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index bbb7944..edda9ea 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -1438,7 +1438,7 @@ return 0; } -static struct block_device_operations lo_fops = { +static const struct block_device_operations lo_fops = { .owner = THIS_MODULE, .open = lo_open, .release = lo_release,
diff --git a/drivers/block/mg_disk.c b/drivers/block/mg_disk.c index 6d7fbaa..e0339aa 100644 --- a/drivers/block/mg_disk.c +++ b/drivers/block/mg_disk.c
@@ -775,7 +775,7 @@ return 0; } -static struct block_device_operations mg_disk_ops = { +static const struct block_device_operations mg_disk_ops = { .getgeo = mg_getgeo };
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 5d23ffa..cc923a5 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c
@@ -722,7 +722,7 @@ return error; } -static struct block_device_operations nbd_fops = +static const struct block_device_operations nbd_fops = { .owner = THIS_MODULE, .locked_ioctl = nbd_ioctl,
diff --git a/drivers/block/osdblk.c b/drivers/block/osdblk.c index 13c1aee..a808b15 100644 --- a/drivers/block/osdblk.c +++ b/drivers/block/osdblk.c
@@ -125,7 +125,7 @@ static DEFINE_MUTEX(ctl_mutex); /* Serialize open/close/setup/teardown */ static LIST_HEAD(osdblkdev_list); -static struct block_device_operations osdblk_bd_ops = { +static const struct block_device_operations osdblk_bd_ops = { .owner = THIS_MODULE, };
diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index 9f3518c5..8866ca3 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c
@@ -247,7 +247,7 @@ return cdrom_media_changed(&cd->info); } -static struct block_device_operations pcd_bdops = { +static const struct block_device_operations pcd_bdops = { .owner = THIS_MODULE, .open = pcd_block_open, .release = pcd_block_release,
diff --git a/drivers/block/paride/pd.c b/drivers/block/paride/pd.c index bf5955b..569e39e 100644 --- a/drivers/block/paride/pd.c +++ b/drivers/block/paride/pd.c
@@ -807,7 +807,7 @@ return 0; } -static struct block_device_operations pd_fops = { +static const struct block_device_operations pd_fops = { .owner = THIS_MODULE, .open = pd_open, .release = pd_release,
diff --git a/drivers/block/paride/pf.c b/drivers/block/paride/pf.c index 68a90834..ea54ea3 100644 --- a/drivers/block/paride/pf.c +++ b/drivers/block/paride/pf.c
@@ -262,7 +262,7 @@ /* kernel glue structures */ -static struct block_device_operations pf_fops = { +static const struct block_device_operations pf_fops = { .owner = THIS_MODULE, .open = pf_open, .release = pf_release,
diff --git a/drivers/block/pktcdvd.c b/drivers/block/pktcdvd.c index fd5bb8a..2ddf03a 100644 --- a/drivers/block/pktcdvd.c +++ b/drivers/block/pktcdvd.c
@@ -2849,7 +2849,7 @@ return attached_disk->fops->media_changed(attached_disk); } -static struct block_device_operations pktcdvd_ops = { +static const struct block_device_operations pktcdvd_ops = { .owner = THIS_MODULE, .open = pkt_open, .release = pkt_close,
diff --git a/drivers/block/ps3disk.c b/drivers/block/ps3disk.c index 34cbb7f..03a130d 100644 --- a/drivers/block/ps3disk.c +++ b/drivers/block/ps3disk.c
@@ -82,7 +82,7 @@ static int ps3disk_major; -static struct block_device_operations ps3disk_fops = { +static const struct block_device_operations ps3disk_fops = { .owner = THIS_MODULE, };
diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index c8753a9..3bb7c47 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c
@@ -88,7 +88,7 @@ static int ps3vram_major; -static struct block_device_operations ps3vram_fops = { +static const struct block_device_operations ps3vram_fops = { .owner = THIS_MODULE, };
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c index cbfd9c0ae..411f064 100644 --- a/drivers/block/sunvdc.c +++ b/drivers/block/sunvdc.c
@@ -103,7 +103,7 @@ return 0; } -static struct block_device_operations vdc_fops = { +static const struct block_device_operations vdc_fops = { .owner = THIS_MODULE, .getgeo = vdc_getgeo, };
diff --git a/drivers/block/swim.c b/drivers/block/swim.c index cf7877f..8f569e3 100644 --- a/drivers/block/swim.c +++ b/drivers/block/swim.c
@@ -748,7 +748,7 @@ return !fs->disk_in; } -static struct block_device_operations floppy_fops = { +static const struct block_device_operations floppy_fops = { .owner = THIS_MODULE, .open = floppy_open, .release = floppy_release,
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index 80df93e..e39e382 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c
@@ -998,7 +998,7 @@ return ret; } -static struct block_device_operations floppy_fops = { +static const struct block_device_operations floppy_fops = { .open = floppy_open, .release = floppy_release, .locked_ioctl = floppy_ioctl,
diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c index f5cd2e8..a7c4184 100644 --- a/drivers/block/sx8.c +++ b/drivers/block/sx8.c
@@ -423,7 +423,7 @@ .remove = carm_remove_one, }; -static struct block_device_operations carm_bd_ops = { +static const struct block_device_operations carm_bd_ops = { .owner = THIS_MODULE, .getgeo = carm_bdev_getgeo, };
diff --git a/drivers/block/ub.c b/drivers/block/ub.c index cc54473..c739b20 100644 --- a/drivers/block/ub.c +++ b/drivers/block/ub.c
@@ -1789,7 +1789,7 @@ return lun->changed; } -static struct block_device_operations ub_bd_fops = { +static const struct block_device_operations ub_bd_fops = { .owner = THIS_MODULE, .open = ub_bd_open, .release = ub_bd_release,
diff --git a/drivers/block/umem.c b/drivers/block/umem.c index 858c34d..ad1ba39 100644 --- a/drivers/block/umem.c +++ b/drivers/block/umem.c
@@ -140,7 +140,6 @@ }; static struct cardinfo cards[MM_MAXCARDS]; -static struct block_device_operations mm_fops; static struct timer_list battery_timer; static int num_cards; @@ -789,7 +788,7 @@ return 0; } -static struct block_device_operations mm_fops = { +static const struct block_device_operations mm_fops = { .owner = THIS_MODULE, .getgeo = mm_getgeo, .revalidate_disk = mm_revalidate,
diff --git a/drivers/block/viodasd.c b/drivers/block/viodasd.c index b441ce3..a8c8b56 100644 --- a/drivers/block/viodasd.c +++ b/drivers/block/viodasd.c
@@ -219,7 +219,7 @@ /* * Our file operations table */ -static struct block_device_operations viodasd_fops = { +static const struct block_device_operations viodasd_fops = { .owner = THIS_MODULE, .open = viodasd_open, .release = viodasd_release,
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index aa1a3d5..aa89fe4 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c
@@ -243,7 +243,7 @@ return 0; } -static struct block_device_operations virtblk_fops = { +static const struct block_device_operations virtblk_fops = { .locked_ioctl = virtblk_ioctl, .owner = THIS_MODULE, .getgeo = virtblk_getgeo,
diff --git a/drivers/block/xd.c b/drivers/block/xd.c index ce24292..0877d36 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c
@@ -130,7 +130,7 @@ static int xd_getgeo(struct block_device *bdev, struct hd_geometry *geo); -static struct block_device_operations xd_fops = { +static const struct block_device_operations xd_fops = { .owner = THIS_MODULE, .locked_ioctl = xd_ioctl, .getgeo = xd_getgeo,
diff --git a/drivers/block/xen-blkfront.c b/drivers/block/xen-blkfront.c index e532847..b8578bb 100644 --- a/drivers/block/xen-blkfront.c +++ b/drivers/block/xen-blkfront.c
@@ -65,7 +65,7 @@ unsigned long frame[BLKIF_MAX_SEGMENTS_PER_REQUEST]; }; -static struct block_device_operations xlvbd_block_fops; +static const struct block_device_operations xlvbd_block_fops; #define BLK_RING_SIZE __RING_SIZE((struct blkif_sring *)0, PAGE_SIZE) @@ -1039,7 +1039,7 @@ return 0; } -static struct block_device_operations xlvbd_block_fops = +static const struct block_device_operations xlvbd_block_fops = { .owner = THIS_MODULE, .open = blkif_open,
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c index b20abe10..e5c5415 100644 --- a/drivers/block/xsysace.c +++ b/drivers/block/xsysace.c
@@ -941,7 +941,7 @@ return 0; } -static struct block_device_operations ace_fops = { +static const struct block_device_operations ace_fops = { .owner = THIS_MODULE, .open = ace_open, .release = ace_release,
diff --git a/drivers/block/z2ram.c b/drivers/block/z2ram.c index b259040..64f941e 100644 --- a/drivers/block/z2ram.c +++ b/drivers/block/z2ram.c
@@ -64,7 +64,6 @@ static DEFINE_SPINLOCK(z2ram_lock); -static struct block_device_operations z2_fops; static struct gendisk *z2ram_gendisk; static void do_z2_request(struct request_queue *q) @@ -315,7 +314,7 @@ return 0; } -static struct block_device_operations z2_fops = +static const struct block_device_operations z2_fops = { .owner = THIS_MODULE, .open = z2_open,
diff --git a/drivers/cdrom/gdrom.c b/drivers/cdrom/gdrom.c index b5621f2..a762283 100644 --- a/drivers/cdrom/gdrom.c +++ b/drivers/cdrom/gdrom.c
@@ -512,7 +512,7 @@ return cdrom_ioctl(gd.cd_info, bdev, mode, cmd, arg); } -static struct block_device_operations gdrom_bdops = { +static const struct block_device_operations gdrom_bdops = { .owner = THIS_MODULE, .open = gdrom_bdops_open, .release = gdrom_bdops_release,
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 0fff646..57ca69e 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c
@@ -177,7 +177,7 @@ return cdrom_media_changed(&di->viocd_info); } -struct block_device_operations viocd_fops = { +static const struct block_device_operations viocd_fops = { .owner = THIS_MODULE, .open = viocd_blk_open, .release = viocd_blk_release,
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index b79ca41..64207df 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c
@@ -1686,7 +1686,7 @@ return 0; } -static struct block_device_operations idecd_ops = { +static const struct block_device_operations idecd_ops = { .owner = THIS_MODULE, .open = idecd_open, .release = idecd_release,
diff --git a/drivers/ide/ide-gd.c b/drivers/ide/ide-gd.c index 2141190..7532414 100644 --- a/drivers/ide/ide-gd.c +++ b/drivers/ide/ide-gd.c
@@ -321,7 +321,7 @@ return drive->disk_ops->ioctl(drive, bdev, mode, cmd, arg); } -static struct block_device_operations ide_gd_ops = { +static const struct block_device_operations ide_gd_ops = { .owner = THIS_MODULE, .open = ide_gd_open, .release = ide_gd_release,
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 9d6f62b..58fc920 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c
@@ -1913,7 +1913,7 @@ return err; } -static struct block_device_operations idetape_block_ops = { +static const struct block_device_operations idetape_block_ops = { .owner = THIS_MODULE, .open = idetape_open, .release = idetape_release,
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index eee28fa..376f1ab 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c
@@ -1716,7 +1716,7 @@ return r; } -static struct block_device_operations dm_blk_dops; +static const struct block_device_operations dm_blk_dops; static void dm_wq_work(struct work_struct *work); @@ -2663,7 +2663,7 @@ kfree(pools); } -static struct block_device_operations dm_blk_dops = { +static const struct block_device_operations dm_blk_dops = { .open = dm_blk_open, .release = dm_blk_close, .ioctl = dm_blk_ioctl,
diff --git a/drivers/md/md.c b/drivers/md/md.c index 9dd8720..6aa497e 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c
@@ -138,7 +138,7 @@ { .ctl_name = 0 } }; -static struct block_device_operations md_fops; +static const struct block_device_operations md_fops; static int start_readonly; @@ -5556,7 +5556,7 @@ mddev->changed = 0; return 0; } -static struct block_device_operations md_fops = +static const struct block_device_operations md_fops = { .owner = THIS_MODULE, .open = md_open,
diff --git a/drivers/memstick/core/mspro_block.c b/drivers/memstick/core/mspro_block.c index 7847bbc1..bd83fa0 100644 --- a/drivers/memstick/core/mspro_block.c +++ b/drivers/memstick/core/mspro_block.c
@@ -235,7 +235,7 @@ return 0; } -static struct block_device_operations ms_block_bdops = { +static const struct block_device_operations ms_block_bdops = { .open = mspro_block_bd_open, .release = mspro_block_bd_release, .getgeo = mspro_block_bd_getgeo,
diff --git a/drivers/message/i2o/i2o_block.c b/drivers/message/i2o/i2o_block.c index 335d4c7..d505b68 100644 --- a/drivers/message/i2o/i2o_block.c +++ b/drivers/message/i2o/i2o_block.c
@@ -925,7 +925,7 @@ }; /* I2O Block device operations definition */ -static struct block_device_operations i2o_block_fops = { +static const struct block_device_operations i2o_block_fops = { .owner = THIS_MODULE, .open = i2o_block_open, .release = i2o_block_release,
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index adc205c..85f0e8c 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c
@@ -130,7 +130,7 @@ return 0; } -static struct block_device_operations mmc_bdops = { +static const struct block_device_operations mmc_bdops = { .open = mmc_blk_open, .release = mmc_blk_release, .getgeo = mmc_blk_getgeo,
diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c index 7baba40..0acbf4f 100644 --- a/drivers/mtd/mtd_blkdevs.c +++ b/drivers/mtd/mtd_blkdevs.c
@@ -210,7 +210,7 @@ } } -static struct block_device_operations mtd_blktrans_ops = { +static const struct block_device_operations mtd_blktrans_ops = { .owner = THIS_MODULE, .open = blktrans_open, .release = blktrans_release,
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index e109da4..dad0449 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c
@@ -2146,7 +2146,7 @@ return 0; } -struct block_device_operations +const struct block_device_operations dasd_device_operations = { .owner = THIS_MODULE, .open = dasd_open,
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index 5e47a1e..8afd9fa 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h
@@ -540,7 +540,7 @@ extern debug_info_t *dasd_debug_area; extern struct dasd_profile_info_t dasd_global_profile; extern unsigned int dasd_profile_level; -extern struct block_device_operations dasd_device_operations; +extern const struct block_device_operations dasd_device_operations; extern struct kmem_cache *dasd_page_cache;
diff --git a/drivers/s390/block/dcssblk.c b/drivers/s390/block/dcssblk.c index d346176..f76f4bd 100644 --- a/drivers/s390/block/dcssblk.c +++ b/drivers/s390/block/dcssblk.c
@@ -34,7 +34,7 @@ static char dcssblk_segments[DCSSBLK_PARM_LEN] = "\0"; static int dcssblk_major; -static struct block_device_operations dcssblk_devops = { +static const struct block_device_operations dcssblk_devops = { .owner = THIS_MODULE, .open = dcssblk_open, .release = dcssblk_release,
diff --git a/drivers/s390/block/xpram.c b/drivers/s390/block/xpram.c index ee604e9..116d1b3 100644 --- a/drivers/s390/block/xpram.c +++ b/drivers/s390/block/xpram.c
@@ -244,7 +244,7 @@ return 0; } -static struct block_device_operations xpram_devops = +static const struct block_device_operations xpram_devops = { .owner = THIS_MODULE, .getgeo = xpram_getgeo,
diff --git a/drivers/s390/char/tape_block.c b/drivers/s390/char/tape_block.c index 4cb9e70..64f57ef 100644 --- a/drivers/s390/char/tape_block.c +++ b/drivers/s390/char/tape_block.c
@@ -50,7 +50,7 @@ static int tapeblock_medium_changed(struct gendisk *); static int tapeblock_revalidate_disk(struct gendisk *); -static struct block_device_operations tapeblock_fops = { +static const struct block_device_operations tapeblock_fops = { .owner = THIS_MODULE, .open = tapeblock_open, .release = tapeblock_release,
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index 6d46516..869a30b 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c
@@ -452,7 +452,7 @@ static struct miscdevice jsf_dev = { JSF_MINOR, "jsflash", &jsf_fops }; -static struct block_device_operations jsfd_fops = { +static const struct block_device_operations jsfd_fops = { .owner = THIS_MODULE, };
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a89c421..8dd96dc 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c
@@ -956,7 +956,7 @@ } #endif -static struct block_device_operations sd_fops = { +static const struct block_device_operations sd_fops = { .owner = THIS_MODULE, .open = sd_open, .release = sd_release,
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c index cce0fe4..eb61f7a 100644 --- a/drivers/scsi/sr.c +++ b/drivers/scsi/sr.c
@@ -525,7 +525,7 @@ return cdrom_media_changed(&cd->cdi); } -static struct block_device_operations sr_bdops = +static const struct block_device_operations sr_bdops = { .owner = THIS_MODULE, .open = sr_block_open,
diff --git a/fs/block_dev.c b/fs/block_dev.c index 71e7e03..5d1ed50 100644 --- a/fs/block_dev.c +++ b/fs/block_dev.c
@@ -1114,7 +1114,7 @@ int check_disk_change(struct block_device *bdev) { struct gendisk *disk = bdev->bd_disk; - struct block_device_operations * bdops = disk->fops; + const struct block_device_operations *bdops = disk->fops; if (!bdops->media_changed) return 0;
diff --git a/fs/ext2/xip.c b/fs/ext2/xip.c index b72b858..c18fbf3 100644 --- a/fs/ext2/xip.c +++ b/fs/ext2/xip.c
@@ -20,7 +20,7 @@ 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 */
diff --git a/fs/partitions/check.c b/fs/partitions/check.c index fbeaddf..7b685e1 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c
@@ -581,7 +581,7 @@ } if (from + size > get_capacity(disk)) { - struct block_device_operations *bdops = disk->fops; + const struct block_device_operations *bdops = disk->fops; unsigned long long capacity; printk(KERN_WARNING
diff --git a/include/linux/genhd.h b/include/linux/genhd.h index 109d179..297df45f 100644 --- a/include/linux/genhd.h +++ b/include/linux/genhd.h
@@ -151,7 +151,7 @@ struct disk_part_tbl *part_tbl; struct hd_struct part0; - struct block_device_operations *fops; + const struct block_device_operations *fops; struct request_queue *queue; void *private_data;