const: mark struct vm_struct_operations
Subsystems (65)
PATCH 1/1 const: mark struct vm_struct_operations
* mark struct vm_area_struct::vm_ops as const
* mark vm_ops in AGP code
But leave TTM code alone, something is fishy there with global vm_ops being used.
Signed-off-by Alexey Dobriyan <[email protected]>
---
arch/ia64/ia32/binfmt_elf32.c | 4 ++-- arch/powerpc/platforms/cell/spufs/file.c | 14 +++++++------- arch/x86/pci/i386.c | 2 +- drivers/char/agp/agp.h | 2 +- drivers/char/agp/alpha-agp.c | 2 +- drivers/char/mem.c | 2 +- drivers/char/mspec.c | 2 +- drivers/gpu/drm/drm_vm.c | 8 ++++---- drivers/gpu/drm/radeon/radeon_ttm.c | 2 +- drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 +- drivers/ieee1394/dma.c | 2 +- drivers/infiniband/hw/ehca/ehca_uverbs.c | 2 +- drivers/infiniband/hw/ipath/ipath_file_ops.c | 2 +- drivers/infiniband/hw/ipath/ipath_mmap.c | 2 +- drivers/media/video/cafe_ccic.c | 2 +- drivers/media/video/et61x251/et61x251_core.c | 2 +- drivers/media/video/gspca/gspca.c | 2 +- drivers/media/video/meye.c | 2 +- drivers/media/video/sn9c102/sn9c102_core.c | 2 +- drivers/media/video/stk-webcam.c | 2 +- drivers/media/video/uvc/uvc_v4l2.c | 2 +- drivers/media/video/videobuf-dma-contig.c | 2 +- drivers/media/video/videobuf-dma-sg.c | 2 +- drivers/media/video/videobuf-vmalloc.c | 2 +- drivers/media/video/vino.c | 2 +- drivers/media/video/zc0301/zc0301_core.c | 2 +- drivers/media/video/zoran/zoran_driver.c | 2 +- drivers/misc/sgi-gru/grufile.c | 2 +- drivers/misc/sgi-gru/grutables.h | 2 +- drivers/scsi/sg.c | 2 +- drivers/uio/uio.c | 2 +- drivers/usb/mon/mon_bin.c | 2 +- drivers/video/fb_defio.c | 2 +- drivers/video/omap/dispc.c | 2 +- fs/btrfs/file.c | 2 +- fs/ext4/file.c | 2 +- fs/fuse/file.c | 2 +- fs/gfs2/file.c | 2 +- fs/ncpfs/mmap.c | 2 +- fs/nfs/file.c | 4 ++-- fs/nilfs2/file.c | 2 +- fs/ocfs2/mmap.c | 2 +- fs/sysfs/bin.c | 4 ++-- fs/ubifs/file.c | 2 +- fs/xfs/linux-2.6/xfs_file.c | 4 ++-- include/linux/agp_backend.h | 2 +- include/linux/hugetlb.h | 2 +- include/linux/mm_types.h | 2 +- include/linux/ramfs.h | 2 +- ipc/shm.c | 4 ++-- kernel/perf_event.c | 2 +- kernel/relay.c | 2 +- mm/filemap.c | 2 +- mm/filemap_xip.c | 2 +- mm/hugetlb.c | 2 +- mm/mmap.c | 2 +- mm/nommu.c | 2 +- mm/shmem.c | 4 ++-- net/packet/af_packet.c | 2 +- sound/core/pcm_native.c | 8 ++++---- sound/usb/usx2y/us122l.c | 2 +- sound/usb/usx2y/usX2Yhwdep.c | 2 +- sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- virt/kvm/kvm_main.c | 4 ++-- 64 files changed, 83 insertions(+), 83 deletions(-)
arch/ia64/ia32/binfmt_elf32.c +2 -2
@@ -69,11 +69,11 @@ ia32_install_gate_page (struct vm_area_struct *vma, struct vm_fault *vmf) } -static struct vm_operations_struct ia32_shared_page_vm_ops = { +static const struct vm_operations_struct ia32_shared_page_vm_ops = { .fault = ia32_install_shared_page }; -static struct vm_operations_struct ia32_gate_page_vm_ops = { +static const struct vm_operations_struct ia32_gate_page_vm_ops = { .fault = ia32_install_gate_page };
arch/powerpc/platforms/cell/spufs/file.c +7 -7
@@ -309,7 +309,7 @@ static int spufs_mem_mmap_access(struct vm_area_struct *vma,return len; } -static struct vm_operations_struct spufs_mem_mmap_vmops = { +static const struct vm_operations_struct spufs_mem_mmap_vmops = { .fault = spufs_mem_mmap_fault, .access = spufs_mem_mmap_access, };
@@ -436,7 +436,7 @@ static int spufs_cntl_mmap_fault(struct vm_area_struct *vma,return spufs_ps_fault (vma, vmf,0x4000 ,SPUFS_CNTL_MAP_SIZE ); } -static struct vm_operations_struct spufs_cntl_mmap_vmops = { +static const struct vm_operations_struct spufs_cntl_mmap_vmops = { .fault = spufs_cntl_mmap_fault, };
@@ -1143,7 +1143,7 @@ spufs_signal1_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)#endif } -static struct vm_operations_struct spufs_signal1_mmap_vmops = { +static const struct vm_operations_struct spufs_signal1_mmap_vmops = { .fault = spufs_signal1_mmap_fault, };
@@ -1279,7 +1279,7 @@ spufs_signal2_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)#endif } -static struct vm_operations_struct spufs_signal2_mmap_vmops = { +static const struct vm_operations_struct spufs_signal2_mmap_vmops = { .fault = spufs_signal2_mmap_fault, };
@@ -1397,7 +1397,7 @@ spufs_mss_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return spufs_ps_fault (vma, vmf,0x0000 ,SPUFS_MSS_MAP_SIZE ); } -static struct vm_operations_struct spufs_mss_mmap_vmops = { +static const struct vm_operations_struct spufs_mss_mmap_vmops = { .fault = spufs_mss_mmap_fault, };
@@ -1458,7 +1458,7 @@ spufs_psmap_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return spufs_ps_fault (vma, vmf,0x0000 ,SPUFS_PS_MAP_SIZE ); } -static struct vm_operations_struct spufs_psmap_mmap_vmops = { +static const struct vm_operations_struct spufs_psmap_mmap_vmops = { .fault = spufs_psmap_mmap_fault, };
@@ -1517,7 +1517,7 @@ spufs_mfc_mmap_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return spufs_ps_fault (vma, vmf,0x3000 ,SPUFS_MFC_MAP_SIZE ); } -static struct vm_operations_struct spufs_mfc_mmap_vmops = { +static const struct vm_operations_struct spufs_mfc_mmap_vmops = { .fault = spufs_mfc_mmap_fault, };
arch/x86/pci/i386.c +1 -1
@@ -266,7 +266,7 @@ void pcibios_set_master(struct pci_dev *dev)pci_write_config_byte (dev,PCI_LATENCY_TIMER , lat); } -static struct vm_operations_struct pci_mmap_ops = { +static const struct vm_operations_struct pci_mmap_ops = { .access = generic_access_phys, };
drivers/char/agp/agp.h +1 -1
@@ -131,7 +131,7 @@ struct agp_bridge_driver {struct agp_bridge_data {const struct agp_version *version;const struct agp_bridge_driver *driver; -struct vm_operations_struct *vm_ops; +const struct vm_operations_struct *vm_ops;void *previous_size;void *current_size;void *dev_private_data;
drivers/char/agp/alpha-agp.c +1 -1
@@ -40,7 +40,7 @@ static struct aper_size_info_fixed alpha_core_agp_sizes[] = { 0, 0, 0 }, /* filled in by alpha_core_agp_setup */ }; -struct vm_operations_struct alpha_core_agp_vm_ops = { +static const struct vm_operations_struct alpha_core_agp_vm_ops = { .fault = alpha_core_agp_vm_fault, };
drivers/char/mem.c +1 -1
@@ -301,7 +301,7 @@ static inline int private_mapping_ok(struct vm_area_struct *vma) }#endif -static struct vm_operations_struct mmap_mem_ops = { +static const struct vm_operations_struct mmap_mem_ops = { #ifdef CONFIG_HAVE_IOREMAP_PROT .access = generic_access_phys #endif
drivers/char/mspec.c +1 -1
@@ -239,7 +239,7 @@ mspec_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return VM_FAULT_NOPAGE ; } -static struct vm_operations_struct mspec_vm_ops = { +static const struct vm_operations_struct mspec_vm_ops = { .open = mspec_open, .close = mspec_close, .fault = mspec_fault,
drivers/gpu/drm/drm_vm.c +4 -4
@@ -369,28 +369,28 @@ static int drm_vm_sg_fault(struct vm_area_struct *vma, struct vm_fault *vmf) }/** AGP virtual memory operations */ -static struct vm_operations_struct drm_vm_ops = { +static const struct vm_operations_struct drm_vm_ops = { .fault = drm_vm_fault, .open = drm_vm_open, .close = drm_vm_close, };/** Shared virtual memory operations */ -static struct vm_operations_struct drm_vm_shm_ops = { +static const struct vm_operations_struct drm_vm_shm_ops = { .fault = drm_vm_shm_fault, .open = drm_vm_open, .close = drm_vm_shm_close, };/** DMA virtual memory operations */ -static struct vm_operations_struct drm_vm_dma_ops = { +static const struct vm_operations_struct drm_vm_dma_ops = { .fault = drm_vm_dma_fault, .open = drm_vm_open, .close = drm_vm_close, };/** Scatter-gather virtual memory operations */ -static struct vm_operations_struct drm_vm_sg_ops = { +static const struct vm_operations_struct drm_vm_sg_ops = { .fault = drm_vm_sg_fault, .open = drm_vm_open, .close = drm_vm_close,
drivers/gpu/drm/radeon/radeon_ttm.c +1 -1
@@ -530,7 +530,7 @@ void radeon_ttm_fini(struct radeon_device *rdev) }static struct vm_operations_struct radeon_ttm_vm_ops; -static struct vm_operations_struct *ttm_vm_ops =NULL ; +static const struct vm_operations_struct *ttm_vm_ops =NULL ;static int radeon_ttm_fault (struct vm_area_struct *vma,struct vm_fault *vmf) {
drivers/gpu/drm/ttm/ttm_bo_vm.c +1 -1
@@ -228,7 +228,7 @@ static void ttm_bo_vm_close(struct vm_area_struct *vma) vma->vm_private_data =NULL ; } -static struct vm_operations_struct ttm_bo_vm_ops = { +static const struct vm_operations_struct ttm_bo_vm_ops = { .fault = ttm_bo_vm_fault, .open = ttm_bo_vm_open, .close = ttm_bo_vm_close
drivers/ieee1394/dma.c +1 -1
@@ -247,7 +247,7 @@ static int dma_region_pagefault(struct vm_area_struct *vma,return 0 ; } -static struct vm_operations_struct dma_region_vm_ops = { +static const struct vm_operations_struct dma_region_vm_ops = { .fault = dma_region_pagefault, };
drivers/infiniband/hw/ehca/ehca_uverbs.c +1 -1
@@ -95,7 +95,7 @@ static void ehca_mm_close(struct vm_area_struct *vma) vma->vm_start, vma->vm_end, *count); } -static struct vm_operations_struct vm_ops = { +static const struct vm_operations_struct vm_ops = { .open = ehca_mm_open, .close = ehca_mm_close, };
drivers/infiniband/hw/ipath/ipath_file_ops.c +1 -1
@@ -1151,7 +1151,7 @@ static int ipath_file_vma_fault(struct vm_area_struct *vma,return 0 ; } -static struct vm_operations_struct ipath_file_vm_ops = { +static const struct vm_operations_struct ipath_file_vm_ops = { .fault = ipath_file_vma_fault, };
drivers/infiniband/hw/ipath/ipath_mmap.c +1 -1
@@ -74,7 +74,7 @@ static void ipath_vma_close(struct vm_area_struct *vma)kref_put (&ip->ref, ipath_release_mmap_info); } -static struct vm_operations_struct ipath_vm_ops = { +static const struct vm_operations_struct ipath_vm_ops = { .open = ipath_vma_open, .close = ipath_vma_close, };
drivers/media/video/cafe_ccic.c +1 -1
@@ -1325,7 +1325,7 @@ static void cafe_v4l_vm_close(struct vm_area_struct *vma)mutex_unlock (&sbuf->cam->s_mutex); } -static struct vm_operations_struct cafe_v4l_vm_ops = { +static const struct vm_operations_struct cafe_v4l_vm_ops = { .open = cafe_v4l_vm_open, .close = cafe_v4l_vm_close };
drivers/media/video/et61x251/et61x251_core.c +1 -1
@@ -1496,7 +1496,7 @@ static void et61x251_vm_close(struct vm_area_struct* vma) } -static struct vm_operations_struct et61x251_vm_ops = { +static const struct vm_operations_struct et61x251_vm_ops = { .open = et61x251_vm_open, .close = et61x251_vm_close, };
drivers/media/video/gspca/gspca.c +1 -1
@@ -99,7 +99,7 @@ static void gspca_vm_close(struct vm_area_struct *vma) frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_MAPPED ; } -static struct vm_operations_struct gspca_vm_ops = { +static const struct vm_operations_struct gspca_vm_ops = { .open = gspca_vm_open, .close = gspca_vm_close, };
drivers/media/video/meye.c +1 -1
@@ -1589,7 +1589,7 @@ static void meye_vm_close(struct vm_area_struct *vma) meye.vma_use_count[idx]--; } -static struct vm_operations_struct meye_vm_ops = { +static const struct vm_operations_struct meye_vm_ops = { .open = meye_vm_open, .close = meye_vm_close, };
drivers/media/video/sn9c102/sn9c102_core.c +1 -1
@@ -2077,7 +2077,7 @@ static void sn9c102_vm_close(struct vm_area_struct* vma) } -static struct vm_operations_struct sn9c102_vm_ops = { +static const struct vm_operations_struct sn9c102_vm_ops = { .open = sn9c102_vm_open, .close = sn9c102_vm_close, };
drivers/media/video/stk-webcam.c +1 -1
@@ -790,7 +790,7 @@ static void stk_v4l_vm_close(struct vm_area_struct *vma)if (sbuf->mapcount ==0 ) sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_MAPPED ; } -static struct vm_operations_struct stk_v4l_vm_ops = { +static const struct vm_operations_struct stk_v4l_vm_ops = { .open = stk_v4l_vm_open, .close = stk_v4l_vm_close };
drivers/media/video/uvc/uvc_v4l2.c +1 -1
@@ -1069,7 +1069,7 @@ static void uvc_vm_close(struct vm_area_struct *vma) buffer->vma_use_count--; } -static struct vm_operations_struct uvc_vm_ops = { +static const struct vm_operations_struct uvc_vm_ops = { .open = uvc_vm_open, .close = uvc_vm_close, };
drivers/media/video/videobuf-dma-contig.c +1 -1
@@ -105,7 +105,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma) } } -static struct vm_operations_struct videobuf_vm_ops = { +static const struct vm_operations_struct videobuf_vm_ops = { .open = videobuf_vm_open, .close = videobuf_vm_close, };
drivers/media/video/videobuf-dma-sg.c +1 -1
@@ -394,7 +394,7 @@ videobuf_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -static struct vm_operations_struct videobuf_vm_ops = +static const struct vm_operations_struct videobuf_vm_ops = { .open = videobuf_vm_open, .close = videobuf_vm_close,
drivers/media/video/videobuf-vmalloc.c +1 -1
@@ -116,7 +116,7 @@ static void videobuf_vm_close(struct vm_area_struct *vma)return ; } -static struct vm_operations_struct videobuf_vm_ops = +static const struct vm_operations_struct videobuf_vm_ops = { .open = videobuf_vm_open, .close = videobuf_vm_close,
drivers/media/video/vino.c +1 -1
@@ -3857,7 +3857,7 @@ static void vino_vm_close(struct vm_area_struct *vma)dprintk ("vino_vm_close(): count = %d\n" , fb->map_count); } -static struct vm_operations_struct vino_vm_ops = { +static const struct vm_operations_struct vino_vm_ops = { .open = vino_vm_open, .close = vino_vm_close, };
drivers/media/video/zc0301/zc0301_core.c +1 -1
@@ -935,7 +935,7 @@ static void zc0301_vm_close(struct vm_area_struct* vma) } -static struct vm_operations_struct zc0301_vm_ops = { +static const struct vm_operations_struct zc0301_vm_ops = { .open = zc0301_vm_open, .close = zc0301_vm_close, };
drivers/media/video/zoran/zoran_driver.c +1 -1
@@ -3172,7 +3172,7 @@ zoran_vm_close (struct vm_area_struct *vma)mutex_unlock (&zr->resource_lock); } -static struct vm_operations_struct zoran_vm_ops = { +static const struct vm_operations_struct zoran_vm_ops = { .open = zoran_vm_open, .close = zoran_vm_close, };
drivers/misc/sgi-gru/grufile.c +1 -1
@@ -438,7 +438,7 @@ static struct miscdevice gru_miscdev = { .fops = &gru_fops, }; -struct vm_operations_struct gru_vm_ops = { +const struct vm_operations_struct gru_vm_ops = { .close = gru_vma_close, .fault = gru_fault, };
drivers/misc/sgi-gru/grutables.h +1 -1
@@ -624,7 +624,7 @@ static inline int is_kernel_context(struct gru_thread_state *gts)*/ struct gru_unload_context_req ; -extern struct vm_operations_struct gru_vm_ops; +extern const struct vm_operations_struct gru_vm_ops;extern struct device *grudev; extern struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma,
drivers/scsi/sg.c +1 -1
@@ -1185,7 +1185,7 @@ sg_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return VM_FAULT_SIGBUS ; } -static struct vm_operations_struct sg_mmap_vm_ops = { +static const struct vm_operations_struct sg_mmap_vm_ops = { .fault = sg_vma_fault, };
drivers/uio/uio.c +1 -1
@@ -658,7 +658,7 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -static struct vm_operations_struct uio_vm_ops = { +static const struct vm_operations_struct uio_vm_ops = { .open = uio_vma_open, .close = uio_vma_close, .fault = uio_vma_fault,
drivers/usb/mon/mon_bin.c +1 -1
@@ -1174,7 +1174,7 @@ static int mon_bin_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -static struct vm_operations_struct mon_bin_vm_ops = { +static const struct vm_operations_struct mon_bin_vm_ops = { .open = mon_bin_vma_open, .close = mon_bin_vma_close, .fault = mon_bin_vma_fault,
drivers/video/fb_defio.c +1 -1
@@ -125,7 +125,7 @@ page_already_added:return 0 ; } -static struct vm_operations_struct fb_deferred_io_vm_ops = { +static const struct vm_operations_struct fb_deferred_io_vm_ops = { .fault = fb_deferred_io_fault, .page_mkwrite = fb_deferred_io_mkwrite, };
drivers/video/omap/dispc.c +1 -1
@@ -1035,7 +1035,7 @@ static void mmap_user_close(struct vm_area_struct *vma)atomic_dec (&dispc.map_count[plane]); } -static struct vm_operations_struct mmap_user_ops = { +static const struct vm_operations_struct mmap_user_ops = { .open = mmap_user_open, .close = mmap_user_close, };
fs/btrfs/file.c +1 -1
@@ -1184,7 +1184,7 @@ out:return ret >0 ?EIO : ret; } -static struct vm_operations_struct btrfs_file_vm_ops = { +static const struct vm_operations_struct btrfs_file_vm_ops = { .fault = filemap_fault, .page_mkwrite = btrfs_page_mkwrite, };
fs/ext4/file.c +1 -1
@@ -81,7 +81,7 @@ ext4_file_write(struct kiocb *iocb, const struct iovec *iov,return generic_file_aio_write (iocb, iov, nr_segs, pos); } -static struct vm_operations_struct ext4_file_vm_ops = { +static const struct vm_operations_struct ext4_file_vm_ops = { .fault = filemap_fault, .page_mkwrite = ext4_page_mkwrite, };
fs/fuse/file.c +1 -1
@@ -1313,7 +1313,7 @@ static int fuse_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -static struct vm_operations_struct fuse_file_vm_ops = { +static const struct vm_operations_struct fuse_file_vm_ops = { .close = fuse_vma_close, .fault = filemap_fault, .page_mkwrite = fuse_page_mkwrite,
fs/gfs2/file.c +1 -1
@@ -418,7 +418,7 @@ out:return ret; } -static struct vm_operations_struct gfs2_vm_ops = { +static const struct vm_operations_struct gfs2_vm_ops = { .fault = filemap_fault, .page_mkwrite = gfs2_page_mkwrite, };
fs/ncpfs/mmap.c +1 -1
@@ -95,7 +95,7 @@ static int ncp_file_mmap_fault(struct vm_area_struct *area,return VM_FAULT_MAJOR ; } -static struct vm_operations_struct ncp_file_mmap = +static const struct vm_operations_struct ncp_file_mmap = { .fault = ncp_file_mmap_fault, };
fs/nfs/file.c +2 -2
@@ -59,7 +59,7 @@ static int nfs_lock(struct file *filp, int cmd, struct file_lock *fl);static int nfs_flock (struct file *filp,int cmd,struct file_lock *fl);static int nfs_setlease (struct file *file,long arg,struct file_lock **fl); -static struct vm_operations_struct nfs_file_vm_ops; +static const struct vm_operations_struct nfs_file_vm_ops;const struct file_operations nfs_file_operations = { .llseek = nfs_file_llseek,
@@ -572,7 +572,7 @@ out_unlock:return VM_FAULT_SIGBUS ; } -static struct vm_operations_struct nfs_file_vm_ops = { +static const struct vm_operations_struct nfs_file_vm_ops = { .fault = filemap_fault, .page_mkwrite = nfs_vm_page_mkwrite, };
fs/nilfs2/file.c +1 -1
@@ -117,7 +117,7 @@ static int nilfs_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -struct vm_operations_struct nilfs_file_vm_ops = { +static const struct vm_operations_struct nilfs_file_vm_ops = { .fault = filemap_fault, .page_mkwrite = nilfs_page_mkwrite, };
fs/ocfs2/mmap.c +1 -1
@@ -202,7 +202,7 @@ out:return ret; } -static struct vm_operations_struct ocfs2_file_vm_ops = { +static const struct vm_operations_struct ocfs2_file_vm_ops = { .fault = ocfs2_fault, .page_mkwrite = ocfs2_page_mkwrite, };
fs/sysfs/bin.c +2 -2
@@ -40,7 +40,7 @@ struct bin_buffer {struct mutex mutex;void *buffer;int mmapped; -struct vm_operations_struct *vm_ops; +const struct vm_operations_struct *vm_ops;struct file *file;struct hlist_node list; };
@@ -331,7 +331,7 @@ static int bin_migrate(struct vm_area_struct *vma, const nodemask_t *from, }#endif -static struct vm_operations_struct bin_vm_ops = { +static const struct vm_operations_struct bin_vm_ops = { .open = bin_vma_open, .close = bin_vma_close, .fault = bin_fault,
fs/ubifs/file.c +1 -1
@@ -1534,7 +1534,7 @@ out_unlock:return err; } -static struct vm_operations_struct ubifs_file_vm_ops = { +static const struct vm_operations_struct ubifs_file_vm_ops = { .fault = filemap_fault, .page_mkwrite = ubifs_vm_page_mkwrite, };
fs/xfs/linux-2.6/xfs_file.c +2 -2
@@ -42,7 +42,7 @@#include <linux/dcache.h> -static struct vm_operations_struct xfs_file_vm_ops; +static const struct vm_operations_struct xfs_file_vm_ops; STATIC ssize_t xfs_file_aio_read(
@@ -280,7 +280,7 @@ const struct file_operations xfs_dir_file_operations = { .fsync = xfs_file_fsync, }; -static struct vm_operations_struct xfs_file_vm_ops = { +static const struct vm_operations_struct xfs_file_vm_ops = { .fault = filemap_fault, .page_mkwrite = xfs_vm_page_mkwrite, };
include/linux/agp_backend.h +1 -1
@@ -53,7 +53,7 @@ struct agp_kern_info {int current_memory;bool cant_use_aperture;unsigned long page_mask; -struct vm_operations_struct *vm_ops; +const struct vm_operations_struct *vm_ops; };/*
include/linux/hugetlb.h +1 -1
@@ -163,7 +163,7 @@ static inline struct hugetlbfs_sb_info *HUGETLBFS_SB(struct super_block *sb) }extern const struct file_operations hugetlbfs_file_operations; -extern struct vm_operations_struct hugetlb_vm_ops; +extern const struct vm_operations_struct hugetlb_vm_ops;struct file *hugetlb_file_setup (const char *name,size_t size,int acct,struct user_struct **user,int creat_flags);int hugetlb_get_quota (struct address_space *mapping,long delta);
include/linux/mm_types.h +1 -1
@@ -171,7 +171,7 @@ struct vm_area_struct {struct anon_vma *anon_vma;/* Serialized by page_table_lock */ /* Function pointers to deal with this struct. */ -struct vm_operations_struct * vm_ops; +const struct vm_operations_struct *vm_ops;/* Information about our backing store: */ unsigned long vm_pgoff;/* Offset (within vm_file) in PAGE_SIZE
include/linux/ramfs.h +1 -1
@@ -17,7 +17,7 @@ extern int ramfs_nommu_mmap(struct file *file, struct vm_area_struct *vma);#endif extern const struct file_operations ramfs_file_operations; -extern struct vm_operations_struct generic_file_vm_ops; +extern const struct vm_operations_struct generic_file_vm_ops;extern int __init init_rootfs (void );#endif
ipc/shm.c +2 -2
@@ -55,7 +55,7 @@ struct shm_file_data {#define shm_file_data (file) (*((struct shm_file_data **)&(file)->private_data))static const struct file_operations shm_file_operations; -static struct vm_operations_struct shm_vm_ops; +static const struct vm_operations_struct shm_vm_ops;#define shm_ids (ns) ((ns)->ids[IPC_SHM_IDS])
@@ -312,7 +312,7 @@ static const struct file_operations shm_file_operations = { .get_unmapped_area = shm_get_unmapped_area, }; -static struct vm_operations_struct shm_vm_ops = { +static const struct vm_operations_struct shm_vm_ops = { .open = shm_open,/* callback for a new vm-area open */ .close = shm_close,/* callback for when the vm-area is released */ .fault = shm_fault,
kernel/perf_event.c +1 -1
@@ -2253,7 +2253,7 @@ static void perf_mmap_close(struct vm_area_struct *vma) } } -static struct vm_operations_struct perf_mmap_vmops = { +static const struct vm_operations_struct perf_mmap_vmops = { .open = perf_mmap_open, .close = perf_mmap_close, .fault = perf_mmap_fault,
kernel/relay.c +1 -1
@@ -60,7 +60,7 @@ static int relay_buf_fault(struct vm_area_struct *vma, struct vm_fault *vmf)/* * vm_ops for relay file mappings. */ -static struct vm_operations_struct relay_file_mmap_ops = { +static const struct vm_operations_struct relay_file_mmap_ops = { .fault = relay_buf_fault, .close = relay_file_mmap_close, };
mm/filemap.c +1 -1
@@ -1611,7 +1611,7 @@ page_not_uptodate: }EXPORT_SYMBOL (filemap_fault); -struct vm_operations_struct generic_file_vm_ops = { +const struct vm_operations_struct generic_file_vm_ops = { .fault = filemap_fault, };
mm/filemap_xip.c +1 -1
@@ -296,7 +296,7 @@ out: } } -static struct vm_operations_struct xip_file_vm_ops = { +static const struct vm_operations_struct xip_file_vm_ops = { .fault = xip_file_fault, };
mm/hugetlb.c +1 -1
@@ -1721,7 +1721,7 @@ static int hugetlb_vm_op_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -struct vm_operations_struct hugetlb_vm_ops = { +const struct vm_operations_struct hugetlb_vm_ops = { .fault = hugetlb_vm_op_fault, .open = hugetlb_vm_op_open, .close = hugetlb_vm_op_close,
mm/mmap.c +1 -1
@@ -2282,7 +2282,7 @@ static void special_mapping_close(struct vm_area_struct *vma) { } -static struct vm_operations_struct special_mapping_vmops = { +static const struct vm_operations_struct special_mapping_vmops = { .close = special_mapping_close, .fault = special_mapping_fault, };
mm/nommu.c +1 -1
@@ -79,7 +79,7 @@ static struct kmem_cache *vm_region_jar;struct rb_root nommu_region_tree =RB_ROOT ;DECLARE_RWSEM (nommu_region_sem); -struct vm_operations_struct generic_file_vm_ops = { +const struct vm_operations_struct generic_file_vm_ops = { };/*
mm/shmem.c +2 -2
@@ -218,7 +218,7 @@ static const struct file_operations shmem_file_operations;static const struct inode_operations shmem_inode_operations;static const struct inode_operations shmem_dir_inode_operations;static const struct inode_operations shmem_special_inode_operations; -static struct vm_operations_struct shmem_vm_ops; +static const struct vm_operations_struct shmem_vm_ops;static struct backing_dev_info shmem_backing_dev_info__read_mostly = { .ra_pages =0 ,/* No readahead */
@@ -2498,7 +2498,7 @@ static const struct super_operations shmem_ops = { .put_super = shmem_put_super, }; -static struct vm_operations_struct shmem_vm_ops = { +static const struct vm_operations_struct shmem_vm_ops = { .fault = shmem_fault, #ifdef CONFIG_NUMA .set_policy = shmem_set_policy,
net/packet/af_packet.c +1 -1
@@ -2084,7 +2084,7 @@ static void packet_mm_close(struct vm_area_struct *vma)atomic_dec (&pkt_sk (sk)->mapped); } -static struct vm_operations_struct packet_mmap_ops = { +static const struct vm_operations_struct packet_mmap_ops = { .open = packet_mm_open, .close = packet_mm_close, };
sound/core/pcm_native.c +4 -4
@@ -2985,7 +2985,7 @@ static int snd_pcm_mmap_status_fault(struct vm_area_struct *area,return 0 ; } -static struct vm_operations_struct snd_pcm_vm_ops_status = +static const struct vm_operations_struct snd_pcm_vm_ops_status = { .fault = snd_pcm_mmap_status_fault, };
@@ -3024,7 +3024,7 @@ static int snd_pcm_mmap_control_fault(struct vm_area_struct *area,return 0 ; } -static struct vm_operations_struct snd_pcm_vm_ops_control = +static const struct vm_operations_struct snd_pcm_vm_ops_control = { .fault = snd_pcm_mmap_control_fault, };
@@ -3094,7 +3094,7 @@ static int snd_pcm_mmap_data_fault(struct vm_area_struct *area,return 0 ; } -static struct vm_operations_struct snd_pcm_vm_ops_data = +static const struct vm_operations_struct snd_pcm_vm_ops_data = { .open = snd_pcm_mmap_data_open, .close = snd_pcm_mmap_data_close,
@@ -3118,7 +3118,7 @@ static int snd_pcm_default_mmap(struct snd_pcm_substream *substream,* mmap the DMA buffer on I/O memory area */ #if SNDRV_PCM_INFO_MMAP_IOMEM -static struct vm_operations_struct snd_pcm_vm_ops_data_mmio = +static const struct vm_operations_struct snd_pcm_vm_ops_data_mmio = { .open = snd_pcm_mmap_data_open, .close = snd_pcm_mmap_data_close,
sound/usb/usx2y/us122l.c +1 -1
@@ -154,7 +154,7 @@ static void usb_stream_hwdep_vm_close(struct vm_area_struct *area)snd_printdd (KERN_DEBUG "%i\n" ,atomic_read (&us122l->mmap_count)); } -static struct vm_operations_struct usb_stream_hwdep_vm_ops = { +static const struct vm_operations_struct usb_stream_hwdep_vm_ops = { .open = usb_stream_hwdep_vm_open, .fault = usb_stream_hwdep_vm_fault, .close = usb_stream_hwdep_vm_close,
sound/usb/usx2y/usX2Yhwdep.c +1 -1
@@ -53,7 +53,7 @@ static int snd_us428ctls_vm_fault(struct vm_area_struct *area,return 0 ; } -static struct vm_operations_struct us428ctls_vm_ops = { +static const struct vm_operations_struct us428ctls_vm_ops = { .fault = snd_us428ctls_vm_fault, };
sound/usb/usx2y/usx2yhwdeppcm.c +1 -1
@@ -697,7 +697,7 @@ static int snd_usX2Y_hwdep_pcm_vm_fault(struct vm_area_struct *area, } -static struct vm_operations_struct snd_usX2Y_hwdep_pcm_vm_ops = { +static const struct vm_operations_struct snd_usX2Y_hwdep_pcm_vm_ops = { .open = snd_usX2Y_hwdep_pcm_vm_open, .close = snd_usX2Y_hwdep_pcm_vm_close, .fault = snd_usX2Y_hwdep_pcm_vm_fault,
virt/kvm/kvm_main.c +2 -2
@@ -1713,7 +1713,7 @@ static int kvm_vcpu_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -static struct vm_operations_struct kvm_vcpu_vm_ops = { +static const struct vm_operations_struct kvm_vcpu_vm_ops = { .fault = kvm_vcpu_fault, };
@@ -2317,7 +2317,7 @@ static int kvm_vm_fault(struct vm_area_struct *vma, struct vm_fault *vmf)return 0 ; } -static struct vm_operations_struct kvm_vm_vm_ops = { +static const struct vm_operations_struct kvm_vm_vm_ops = { .fault = kvm_vm_fault, };
PATCH 1/1 const: constify remaining file_operations
Signed-off-by Alexey Dobriyan <[email protected]>
---
arch/arm/mach-ns9xxx/clock.c | 2 - arch/blackfin/mach-bf561/coreb.c | 2 - arch/cris/arch-v10/drivers/sync_serial.c | 2 - arch/cris/arch-v32/drivers/mach-fs/gpio.c | 2 - arch/powerpc/kvm/timing.c | 2 - arch/powerpc/platforms/cell/spufs/file.c | 2 - arch/powerpc/platforms/pseries/dtl.c | 2 - arch/x86/xen/debugfs.c | 2 - drivers/acpi/video.c | 2 - drivers/block/cciss.c | 2 - drivers/char/apm-emulation.c | 2 - drivers/char/bfin-otp.c | 2 - drivers/char/xilinx_hwicap/xilinx_hwicap.c | 2 - drivers/gpio/gpiolib.c | 2 - drivers/hwmon/fschmd.c | 2 - drivers/lguest/lguest_user.c | 2 - drivers/media/dvb/dvb-core/dmxdev.c | 2 - drivers/media/dvb/firewire/firedtv-ci.c | 2 - drivers/misc/phantom.c | 2 - drivers/misc/sgi-gru/grufile.c | 3 -- drivers/mmc/core/debugfs.c | 2 - drivers/s390/cio/qdio_debug.c | 2 - drivers/s390/cio/qdio_perf.c | 2 - drivers/scsi/sg.c | 43 ++++++++++++++++++++--------- drivers/spi/spidev.c | 2 - drivers/usb/class/usbtmc.c | 2 - drivers/usb/gadget/printer.c | 2 - drivers/usb/host/whci/debug.c | 6 ++-- drivers/usb/misc/rio500.c | 3 -- drivers/uwb/uwb-debug.c | 6 ++-- fs/btrfs/ctree.h | 2 - fs/btrfs/file.c | 2 - fs/btrfs/inode.c | 4 +- fs/jbd2/journal.c | 4 +- fs/nfsd/nfsctl.c | 2 - fs/nilfs2/dir.c | 2 - fs/nilfs2/file.c | 2 - fs/nilfs2/mdt.c | 2 - fs/nilfs2/nilfs.h | 4 +- fs/ocfs2/cluster/heartbeat.c | 2 - fs/ocfs2/cluster/netdebug.c | 4 +- fs/ocfs2/dlm/dlmdebug.c | 8 ++--- fs/ocfs2/super.c | 2 - fs/omfs/dir.c | 2 - fs/omfs/file.c | 2 - fs/omfs/omfs.h | 4 +- include/linux/cgroup.h | 2 - include/linux/fs.h | 2 - kernel/cgroup.c | 10 +++--- kernel/kprobes.c | 4 +- kernel/rcutree_trace.c | 10 +++--- kernel/sched.c | 2 - kernel/time/timer_list.c | 2 - kernel/time/timer_stats.c | 2 - samples/tracepoints/tracepoint-sample.c | 2 - security/integrity/ima/ima_fs.c | 10 +++--- 56 files changed, 110 insertions(+), 95 deletions(-)
arch/arm/mach-ns9xxx/clock.c +1 -1
@@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode *inode, struct file *file)return single_open (file, clk_debugfs_show,NULL ); } -static struct file_operations clk_debugfs_operations = { +static const struct file_operations clk_debugfs_operations = { .open = clk_debugfs_open, .read = seq_read, .llseek = seq_lseek,
arch/blackfin/mach-bf561/coreb.c +1 -1
@@ -48,7 +48,7 @@ coreb_ioctl(struct inode *inode, struct file *file, unsigned int cmd, unsigned lreturn ret; } -static struct file_operations coreb_fops = { +static const struct file_operations coreb_fops = { .owner =THIS_MODULE , .ioctl = coreb_ioctl, };
arch/cris/arch-v10/drivers/sync_serial.c +1 -1
@@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_shadow;#define NUMBER_OF_PORTS 2 -static struct file_operations sync_serial_fops = { +static const struct file_operations sync_serial_fops = { .owner =THIS_MODULE , .write = sync_serial_write, .read = sync_serial_read,
arch/cris/arch-v32/drivers/mach-fs/gpio.c +1 -1
@@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsigned long arg)return 0 ; } -struct file_operations gpio_fops = { +static const struct file_operations gpio_fops = { .owner =THIS_MODULE , .poll = gpio_poll, .ioctl = gpio_ioctl,
arch/powerpc/kvm/timing.c +1 -1
@@ -201,7 +201,7 @@ static int kvmppc_exit_timing_open(struct inode *inode, struct file *file)return single_open (file, kvmppc_exit_timing_show, inode->i_private); } -static struct file_operations kvmppc_exit_timing_fops = { +static const struct file_operations kvmppc_exit_timing_fops = { .owner =THIS_MODULE , .open = kvmppc_exit_timing_open, .read = seq_read,
arch/powerpc/platforms/cell/spufs/file.c +1 -1
@@ -147,7 +147,7 @@ static int __fops ## _open(struct inode *inode, struct file *file) \__simple_attr_check_format (__fmt,0ull ); \return spufs_attr_open (inode, file, __get, __set, __fmt); \ } \ -static struct file_operations __fops = { \ +static const struct file_operations __fops = { \ .owner =THIS_MODULE , \ .open = __fops ## _open, \ .release = spufs_attr_release, \
arch/powerpc/platforms/pseries/dtl.c +1 -1
@@ -209,7 +209,7 @@ static ssize_t dtl_file_read(struct file *filp, char __user *buf, size_t len,return n_read *sizeof (struct dtl_entry ); } -static struct file_operations dtl_fops = { +static const struct file_operations dtl_fops = { .open = dtl_file_open, .release = dtl_file_release, .read = dtl_file_read,
arch/x86/xen/debugfs.c +1 -1
@@ -100,7 +100,7 @@ static int xen_array_release(struct inode *inode, struct file *file)return 0 ; } -static struct file_operations u32_array_fops = { +static const struct file_operations u32_array_fops = { .owner =THIS_MODULE , .open = u32_array_open, .release= xen_array_release,
drivers/acpi/video.c +1 -1
@@ -285,7 +285,7 @@ static int acpi_video_device_brightness_open_fs(struct inode *inode, struct file *file);static ssize_t acpi_video_device_write_brightness (struct file *file,const char __user *buffer,size_t count,loff_t *data); -static struct file_operations acpi_video_device_brightness_fops = { +static const struct file_operations acpi_video_device_brightness_fops = { .owner =THIS_MODULE , .open = acpi_video_device_brightness_open_fs, .read = seq_read,
drivers/block/cciss.c +1 -1
@@ -426,7 +426,7 @@ out:return err; } -static struct file_operations cciss_proc_fops = { +static const struct file_operations cciss_proc_fops = { .owner =THIS_MODULE , .open = cciss_seq_open, .read = seq_read,
drivers/char/apm-emulation.c +1 -1
@@ -393,7 +393,7 @@ static int apm_open(struct inode * inode, struct file * filp)return as ?0 : -ENOMEM ; } -static struct file_operations apm_bios_fops = { +static const struct file_operations apm_bios_fops = { .owner =THIS_MODULE , .read = apm_read, .poll = apm_poll,
drivers/char/bfin-otp.c +1 -1
@@ -217,7 +217,7 @@ static long bfin_otp_ioctl(struct file *filp, unsigned cmd, unsigned long arg)# define bfin_otp_ioctl NULL#endif -static struct file_operations bfin_otp_fops = { +static const struct file_operations bfin_otp_fops = { .owner =THIS_MODULE , .unlocked_ioctl = bfin_otp_ioctl, .read = bfin_otp_read,
drivers/char/xilinx_hwicap/xilinx_hwicap.c +1 -1
@@ -559,7 +559,7 @@ static int hwicap_release(struct inode *inode, struct file *file)return status; } -static struct file_operations hwicap_fops = { +static const struct file_operations hwicap_fops = { .owner =THIS_MODULE , .write = hwicap_write, .read = hwicap_read,
drivers/gpio/gpiolib.c +1 -1
@@ -1487,7 +1487,7 @@ static int gpiolib_open(struct inode *inode, struct file *file)return single_open (file, gpiolib_show,NULL ); } -static struct file_operations gpiolib_operations = { +static const struct file_operations gpiolib_operations = { .open = gpiolib_open, .read = seq_read, .llseek = seq_lseek,
drivers/hwmon/fschmd.c +1 -1
@@ -915,7 +915,7 @@ static int watchdog_ioctl(struct inode *inode, struct file *filp,return ret; } -static struct file_operations watchdog_fops = { +static const struct file_operations watchdog_fops = { .owner =THIS_MODULE , .llseek = no_llseek, .open = watchdog_open,
drivers/lguest/lguest_user.c +1 -1
@@ -508,7 +508,7 @@ static int close(struct inode *inode, struct file *file)* uses: reading and writing a character device called /dev/lguest. All the * work happens in the read(), write() and close() routines: */ -static struct file_operations lguest_fops = { +static const struct file_operations lguest_fops = { .owner =THIS_MODULE , .release = close, .write = write,
drivers/media/dvb/dvb-core/dmxdev.c +1 -1
@@ -1203,7 +1203,7 @@ static unsigned int dvb_dvr_poll(struct file *file, poll_table *wait)return mask; } -static struct file_operations dvb_dvr_fops = { +static const struct file_operations dvb_dvr_fops = { .owner =THIS_MODULE , .read = dvb_dvr_read, .write = dvb_dvr_write,
drivers/media/dvb/firewire/firedtv-ci.c +1 -1
@@ -215,7 +215,7 @@ static unsigned int fdtv_ca_io_poll(struct file *file, poll_table *wait)return POLLIN ; } -static struct file_operations fdtv_ca_fops = { +static const struct file_operations fdtv_ca_fops = { .owner =THIS_MODULE , .ioctl = dvb_generic_ioctl, .open = dvb_generic_open,
drivers/misc/phantom.c +1 -1
@@ -271,7 +271,7 @@ static unsigned int phantom_poll(struct file *file, poll_table *wait)return mask; } -static struct file_operations phantom_file_ops = { +static const struct file_operations phantom_file_ops = { .open = phantom_open, .release = phantom_release, .unlocked_ioctl = phantom_ioctl,
drivers/misc/sgi-gru/grufile.c +1 -2
@@ -53,7 +53,6 @@ struct gru_stats_s gru_stats;/* Guaranteed user available resources on each node */ static int max_user_cbrs, max_user_dsr_bytes; -static struct file_operations gru_fops;static struct miscdevice gru_miscdev;
@@ -426,7 +425,7 @@ static void __exit gru_exit(void)gru_proc_exit (); } -static struct file_operations gru_fops = { +static const struct file_operations gru_fops = { .owner =THIS_MODULE , .unlocked_ioctl = gru_file_unlocked_ioctl, .mmap = gru_file_mmap,
drivers/mmc/core/debugfs.c +1 -1
@@ -240,7 +240,7 @@ static int mmc_ext_csd_release(struct inode *inode, struct file *file)return 0 ; } -static struct file_operations mmc_dbg_ext_csd_fops = { +static const struct file_operations mmc_dbg_ext_csd_fops = { .open = mmc_ext_csd_open, .read = mmc_ext_csd_read, .release = mmc_ext_csd_release,
drivers/s390/cio/qdio_debug.c +1 -1
@@ -125,7 +125,7 @@ static int qstat_seq_open(struct inode *inode, struct file *filp) filp->f_path.dentry->d_inode->i_private); } -static struct file_operations debugfs_fops = { +static const struct file_operations debugfs_fops = { .owner =THIS_MODULE , .open = qstat_seq_open, .read = seq_read,
drivers/s390/cio/qdio_perf.c +1 -1
@@ -84,7 +84,7 @@ static int qdio_perf_seq_open(struct inode *inode, struct file *filp)return single_open (filp, qdio_perf_proc_show,NULL ); } -static struct file_operations qdio_perf_proc_fops = { +static const struct file_operations qdio_perf_proc_fops = { .owner =THIS_MODULE , .open = qdio_perf_seq_open, .read = seq_read,
drivers/scsi/sg.c +30 -13
109 lines not on this page · raw message
drivers/spi/spidev.c +1 -1
@@ -537,7 +537,7 @@ static int spidev_release(struct inode *inode, struct file *filp)return status; } -static struct file_operations spidev_fops = { +static const struct file_operations spidev_fops = { .owner =THIS_MODULE ,/* REVISIT switch to aio primitives, so that userspace * gets more complete API coverage. It'll simplify things
drivers/usb/class/usbtmc.c +1 -1
@@ -993,7 +993,7 @@ skip_io_on_zombie:return retval; } -static struct file_operations fops = { +static const struct file_operations fops = { .owner =THIS_MODULE , .read = usbtmc_read, .write = usbtmc_write,
drivers/usb/gadget/printer.c +1 -1
@@ -875,7 +875,7 @@ printer_ioctl(struct file *fd, unsigned int code, unsigned long arg) }/* used after endpoint configuration */ -static struct file_operations printer_io_operations = { +static const struct file_operations printer_io_operations = { .owner =THIS_MODULE , .open = printer_open, .read = printer_read,
drivers/usb/host/whci/debug.c +3 -3
@@ -134,7 +134,7 @@ static int pzl_open(struct inode *inode, struct file *file)return single_open (file, pzl_print, inode->i_private); } -static struct file_operations di_fops = { +static const struct file_operations di_fops = { .open = di_open, .read = seq_read, .llseek = seq_lseek,
@@ -142,7 +142,7 @@ static struct file_operations di_fops = { .owner = THIS_MODULE, }; -static struct file_operations asl_fops = { +static const struct file_operations asl_fops = { .open = asl_open, .read = seq_read, .llseek = seq_lseek,
@@ -150,7 +150,7 @@ static struct file_operations asl_fops = { .owner = THIS_MODULE, }; -static struct file_operations pzl_fops = { +static const struct file_operations pzl_fops = { .open = pzl_open, .read = seq_read, .llseek = seq_lseek,
drivers/usb/misc/rio500.c +1 -2
@@ -429,8 +429,7 @@ read_rio(struct file *file, char __user *buffer, size_t count, loff_t * ppos)return read_count; } -static struct -file_operations usb_rio_fops = { +static const struct file_operations usb_rio_fops = { .owner =THIS_MODULE , .read = read_rio, .write = write_rio,
drivers/uwb/uwb-debug.c +3 -3
@@ -205,7 +205,7 @@ static ssize_t command_write(struct file *file, const char __user *buf,return ret <0 ? ret : len; } -static struct file_operations command_fops = { +static const struct file_operations command_fops = { .open = command_open, .write = command_write, .read =NULL ,
@@ -255,7 +255,7 @@ static int reservations_open(struct inode *inode, struct file *file)return single_open (file, reservations_print, inode->i_private); } -static struct file_operations reservations_fops = { +static const struct file_operations reservations_fops = { .open = reservations_open, .read = seq_read, .llseek = seq_lseek,
@@ -283,7 +283,7 @@ static int drp_avail_open(struct inode *inode, struct file *file)return single_open (file, drp_avail_print, inode->i_private); } -static struct file_operations drp_avail_fops = { +static const struct file_operations drp_avail_fops = { .open = drp_avail_open, .read = seq_read, .llseek = seq_lseek,
fs/btrfs/ctree.h +1 -1
@@ -2326,7 +2326,7 @@ int btrfs_sync_file(struct file *file, struct dentry *dentry, int datasync);int btrfs_drop_extent_cache (struct inode *inode,u64 start,u64 end,int skip_pinned);int btrfs_check_file (struct btrfs_root *root,struct inode *inode); -extern struct file_operations btrfs_file_operations; +extern const struct file_operations btrfs_file_operations; int btrfs_drop_extents(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct inode *inode, u64 start, u64 end, u64 locked_end,
fs/btrfs/file.c +1 -1
@@ -1196,7 +1196,7 @@ static int btrfs_file_mmap(struct file *filp, struct vm_area_struct *vma)return 0 ; } -struct file_operations btrfs_file_operations = { +const struct file_operations btrfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .aio_read = generic_file_aio_read,
fs/btrfs/inode.c +2 -2
@@ -62,7 +62,7 @@ static const struct inode_operations btrfs_special_inode_operations;static const struct inode_operations btrfs_file_inode_operations;static const struct address_space_operations btrfs_aops;static const struct address_space_operations btrfs_symlink_aops; -static struct file_operations btrfs_dir_file_operations; +static const struct file_operations btrfs_dir_file_operations;static struct extent_io_ops btrfs_extent_io_ops;static struct kmem_cache *btrfs_inode_cachep;
@@ -5544,7 +5544,7 @@ static const struct inode_operations btrfs_dir_ro_inode_operations = { .permission = btrfs_permission, }; -static struct file_operations btrfs_dir_file_operations = { +static const struct file_operations btrfs_dir_file_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = btrfs_real_readdir,
fs/jbd2/journal.c +2 -2
@@ -818,7 +818,7 @@ static int jbd2_seq_history_release(struct inode *inode, struct file *file)return seq_release (inode, file); } -static struct file_operations jbd2_seq_history_fops = { +static const struct file_operations jbd2_seq_history_fops = { .owner =THIS_MODULE , .open = jbd2_seq_history_open, .read = seq_read,
@@ -920,7 +920,7 @@ static int jbd2_seq_info_release(struct inode *inode, struct file *file)return seq_release (inode, file); } -static struct file_operations jbd2_seq_info_fops = { +static const struct file_operations jbd2_seq_info_fops = { .owner =THIS_MODULE , .open = jbd2_seq_info_open, .read = seq_read,
fs/nfsd/nfsctl.c +1 -1
@@ -176,7 +176,7 @@ static const struct file_operations exports_operations = {extern int nfsd_pool_stats_open (struct inode *inode,struct file *file);extern int nfsd_pool_stats_release (struct inode *inode,struct file *file); -static struct file_operations pool_stats_operations = { +static const struct file_operations pool_stats_operations = { .open = nfsd_pool_stats_open, .read = seq_read, .llseek = seq_lseek,
fs/nilfs2/dir.c +1 -1
@@ -697,7 +697,7 @@ not_empty:return 0 ; } -struct file_operations nilfs_dir_operations = { +const struct file_operations nilfs_dir_operations = { .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = nilfs_readdir,
fs/nilfs2/file.c +1 -1
@@ -134,7 +134,7 @@ static int nilfs_file_mmap(struct file *file, struct vm_area_struct *vma)* We have mostly NULL's here: the current defaults are ok for * the nilfs filesystem. */ -struct file_operations nilfs_file_operations = { +const struct file_operations nilfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write,
fs/nilfs2/mdt.c +1 -1
@@ -433,7 +433,7 @@ static const struct address_space_operations def_mdt_aops = { };static const struct inode_operations def_mdt_iops; -static struct file_operations def_mdt_fops; +static const struct file_operations def_mdt_fops;/* * NILFS2 uses pseudo inodes for meta data files such as DAT, cpfile, sufile,
fs/nilfs2/nilfs.h +2 -2
@@ -294,9 +294,9 @@ void nilfs_clear_gcdat_inode(struct the_nilfs *);/* * Inodes and files operations */ -extern struct file_operations nilfs_dir_operations; +extern const struct file_operations nilfs_dir_operations;extern const struct inode_operations nilfs_file_inode_operations; -extern struct file_operations nilfs_file_operations; +extern const struct file_operations nilfs_file_operations;extern const struct address_space_operations nilfs_aops;extern const struct inode_operations nilfs_dir_inode_operations;extern const struct inode_operations nilfs_special_inode_operations;
fs/ocfs2/cluster/heartbeat.c +1 -1
@@ -966,7 +966,7 @@ static ssize_t o2hb_debug_read(struct file *file, char __user *buf, }#endif /* CONFIG_DEBUG_FS */ -static struct file_operations o2hb_debug_fops = { +static const struct file_operations o2hb_debug_fops = { .open = o2hb_debug_open, .release = o2hb_debug_release, .read = o2hb_debug_read,
fs/ocfs2/cluster/netdebug.c +2 -2
@@ -207,7 +207,7 @@ static int nst_fop_release(struct inode *inode, struct file *file)return seq_release_private (inode, file); } -static struct file_operations nst_seq_fops = { +static const struct file_operations nst_seq_fops = { .open = nst_fop_open, .read = seq_read, .llseek = seq_lseek,
@@ -388,7 +388,7 @@ static int sc_fop_release(struct inode *inode, struct file *file)return seq_release_private (inode, file); } -static struct file_operations sc_seq_fops = { +static const struct file_operations sc_seq_fops = { .open = sc_fop_open, .read = seq_read, .llseek = seq_lseek,
fs/ocfs2/dlm/dlmdebug.c +4 -4
@@ -478,7 +478,7 @@ bail:return -ENOMEM ; } -static struct file_operations debug_purgelist_fops = { +static const struct file_operations debug_purgelist_fops = { .open = debug_purgelist_open, .release = debug_buffer_release, .read = debug_buffer_read,
@@ -538,7 +538,7 @@ bail:return -ENOMEM ; } -static struct file_operations debug_mle_fops = { +static const struct file_operations debug_mle_fops = { .open = debug_mle_open, .release = debug_buffer_release, .read = debug_buffer_read,
@@ -741,7 +741,7 @@ static int debug_lockres_release(struct inode *inode, struct file *file)return seq_release_private (inode, file); } -static struct file_operations debug_lockres_fops = { +static const struct file_operations debug_lockres_fops = { .open = debug_lockres_open, .release = debug_lockres_release, .read = seq_read,
@@ -925,7 +925,7 @@ bail:return -ENOMEM ; } -static struct file_operations debug_state_fops = { +static const struct file_operations debug_state_fops = { .open = debug_state_open, .release = debug_buffer_release, .read = debug_buffer_read,
fs/ocfs2/super.c +1 -1
@@ -373,7 +373,7 @@ static ssize_t ocfs2_debug_read(struct file *file, char __user *buf, }#endif /* CONFIG_DEBUG_FS */ -static struct file_operations ocfs2_osb_debug_fops = { +static const struct file_operations ocfs2_osb_debug_fops = { .open = ocfs2_osb_debug_open, .release = ocfs2_debug_release, .read = ocfs2_debug_read,
fs/omfs/dir.c +1 -1
@@ -498,7 +498,7 @@ const struct inode_operations omfs_dir_inops = { .rmdir = omfs_rmdir, }; -struct file_operations omfs_dir_operations = { +const struct file_operations omfs_dir_operations = { .read = generic_read_dir, .readdir = omfs_readdir, .llseek = generic_file_llseek,
fs/omfs/file.c +1 -1
@@ -322,7 +322,7 @@ static sector_t omfs_bmap(struct address_space *mapping, sector_t block)return generic_block_bmap (mapping, block, omfs_get_block); } -struct file_operations omfs_file_operations = { +const struct file_operations omfs_file_operations = { .llseek = generic_file_llseek, .read = do_sync_read, .write = do_sync_write,
fs/omfs/omfs.h +2 -2
@@ -44,14 +44,14 @@ extern int omfs_allocate_range(struct super_block *sb, int min_request,extern int omfs_clear_range (struct super_block *sb,u64 block,int count);/* dir.c */ -extern struct file_operations omfs_dir_operations; +extern const struct file_operations omfs_dir_operations;extern const struct inode_operations omfs_dir_inops;extern int omfs_make_empty (struct inode *inode,struct super_block *sb);extern int omfs_is_bad (struct omfs_sb_info *sbi,struct omfs_header *header,u64 fsblock);/* file.c */ -extern struct file_operations omfs_file_operations; +extern const struct file_operations omfs_file_operations;extern const struct inode_operations omfs_file_inops;extern const struct address_space_operations omfs_aops;extern void omfs_make_empty_table (struct buffer_head *bh,int offset);
include/linux/cgroup.h +1 -1
@@ -37,7 +37,7 @@ extern void cgroup_exit(struct task_struct *p, int run_callbacks);extern int cgroupstats_build (struct cgroupstats *stats,struct dentry *dentry); -extern struct file_operations proc_cgroup_operations; +extern const struct file_operations proc_cgroup_operations;/* Define the enumeration of all cgroup subsystems */ #define SUBSYS (_x) _x ## _subsys_id,
include/linux/fs.h +1 -1
@@ -2446,7 +2446,7 @@ static int __fops ## _open(struct inode *inode, struct file *file) \__simple_attr_check_format (__fmt,0ull ); \return simple_attr_open (inode, file, __get, __set, __fmt); \ } \ -static struct file_operations __fops = { \ +static const struct file_operations __fops = { \ .owner =THIS_MODULE , \ .open = __fops ## _open, \ .release = simple_attr_release, \
kernel/cgroup.c +5 -5
@@ -703,7 +703,7 @@ static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode);static int cgroup_rmdir (struct inode *unused_dir,struct dentry *dentry);static int cgroup_populate_dir (struct cgroup *cgrp);static const struct inode_operations cgroup_dir_inode_operations; -static struct file_operations proc_cgroupstats_operations; +static const struct file_operations proc_cgroupstats_operations;static struct backing_dev_info cgroup_backing_dev_info = { .name ="cgroup" ,
@@ -1863,7 +1863,7 @@ static int cgroup_seqfile_release(struct inode *inode, struct file *file)return single_release (inode, file); } -static struct file_operations cgroup_seqfile_operations = { +static const struct file_operations cgroup_seqfile_operations = { .read = seq_read, .write = cgroup_file_write, .llseek = seq_lseek,
@@ -1922,7 +1922,7 @@ static int cgroup_rename(struct inode *old_dir, struct dentry *old_dentry,return simple_rename (old_dir, old_dentry, new_dir, new_dentry); } -static struct file_operations cgroup_file_operations = { +static const struct file_operations cgroup_file_operations = { .read = cgroup_file_read, .write = cgroup_file_write, .llseek = generic_file_llseek,
@@ -3369,7 +3369,7 @@ static int cgroup_open(struct inode *inode, struct file *file)return single_open (file, proc_cgroup_show, pid); } -struct file_operations proc_cgroup_operations = { +const struct file_operations proc_cgroup_operations = { .open = cgroup_open, .read = seq_read, .llseek = seq_lseek,
@@ -3398,7 +3398,7 @@ static int cgroupstats_open(struct inode *inode, struct file *file)return single_open (file, proc_cgroupstats_show,NULL ); } -static struct file_operations proc_cgroupstats_operations = { +static const struct file_operations proc_cgroupstats_operations = { .open = cgroupstats_open, .read = seq_read, .llseek = seq_lseek,
kernel/kprobes.c +2 -2
@@ -1333,7 +1333,7 @@ static int __kprobes kprobes_open(struct inode *inode, struct file *filp)return seq_open (filp, &kprobes_seq_ops); } -static struct file_operations debugfs_kprobes_operations = { +static const struct file_operations debugfs_kprobes_operations = { .open = kprobes_open, .read = seq_read, .llseek = seq_lseek,
@@ -1515,7 +1515,7 @@ static ssize_t write_enabled_file_bool(struct file *file,return count; } -static struct file_operations fops_kp = { +static const struct file_operations fops_kp = { .read = read_enabled_file_bool, .write = write_enabled_file_bool, };
kernel/rcutree_trace.c +5 -5
@@ -93,7 +93,7 @@ static int rcudata_open(struct inode *inode, struct file *file)return single_open (file, show_rcudata,NULL ); } -static struct file_operations rcudata_fops = { +static const struct file_operations rcudata_fops = { .owner =THIS_MODULE , .open = rcudata_open, .read = seq_read,
@@ -145,7 +145,7 @@ static int rcudata_csv_open(struct inode *inode, struct file *file)return single_open (file, show_rcudata_csv,NULL ); } -static struct file_operations rcudata_csv_fops = { +static const struct file_operations rcudata_csv_fops = { .owner =THIS_MODULE , .open = rcudata_csv_open, .read = seq_read,
@@ -196,7 +196,7 @@ static int rcuhier_open(struct inode *inode, struct file *file)return single_open (file, show_rcuhier,NULL ); } -static struct file_operations rcuhier_fops = { +static const struct file_operations rcuhier_fops = { .owner =THIS_MODULE , .open = rcuhier_open, .read = seq_read,
@@ -222,7 +222,7 @@ static int rcugp_open(struct inode *inode, struct file *file)return single_open (file, show_rcugp,NULL ); } -static struct file_operations rcugp_fops = { +static const struct file_operations rcugp_fops = { .owner =THIS_MODULE , .open = rcugp_open, .read = seq_read,
@@ -276,7 +276,7 @@ static int rcu_pending_open(struct inode *inode, struct file *file)return single_open (file, show_rcu_pending,NULL ); } -static struct file_operations rcu_pending_fops = { +static const struct file_operations rcu_pending_fops = { .owner =THIS_MODULE , .open = rcu_pending_open, .read = seq_read,
kernel/sched.c +1 -1
@@ -780,7 +780,7 @@ static int sched_feat_open(struct inode *inode, struct file *filp)return single_open (filp, sched_feat_show,NULL ); } -static struct file_operations sched_feat_fops = { +static const struct file_operations sched_feat_fops = { .open = sched_feat_open, .write = sched_feat_write, .read = seq_read,
kernel/time/timer_list.c +1 -1
@@ -275,7 +275,7 @@ static int timer_list_open(struct inode *inode, struct file *filp)return single_open (filp, timer_list_show,NULL ); } -static struct file_operations timer_list_fops = { +static const struct file_operations timer_list_fops = { .open = timer_list_open, .read = seq_read, .llseek = seq_lseek,
kernel/time/timer_stats.c +1 -1
@@ -395,7 +395,7 @@ static int tstats_open(struct inode *inode, struct file *filp)return single_open (filp, tstats_show,NULL ); } -static struct file_operations tstats_fops = { +static const struct file_operations tstats_fops = { .open = tstats_open, .read = seq_read, .write = tstats_write,
samples/tracepoints/tracepoint-sample.c +1 -1
@@ -28,7 +28,7 @@ static int my_open(struct inode *inode, struct file *file)return -EPERM ; } -static struct file_operations mark_ops = { +static const struct file_operations mark_ops = { .open = my_open, };
security/integrity/ima/ima_fs.c +5 -5
@@ -43,7 +43,7 @@ static ssize_t ima_show_htable_violations(struct file *filp,return ima_show_htable_value (buf, count, ppos, &ima_htable.violations); } -static struct file_operations ima_htable_violations_ops = { +static const struct file_operations ima_htable_violations_ops = { .read = ima_show_htable_violations };
@@ -55,7 +55,7 @@ static ssize_t ima_show_measurements_count(struct file *filp, } -static struct file_operations ima_measurements_count_ops = { +static const struct file_operations ima_measurements_count_ops = { .read = ima_show_measurements_count };
@@ -158,7 +158,7 @@ static int ima_measurements_open(struct inode *inode, struct file *file)return seq_open (file, &ima_measurments_seqops); } -static struct file_operations ima_measurements_ops = { +static const struct file_operations ima_measurements_ops = { .open = ima_measurements_open, .read = seq_read, .llseek = seq_lseek,
@@ -233,7 +233,7 @@ static int ima_ascii_measurements_open(struct inode *inode, struct file *file)return seq_open (file, &ima_ascii_measurements_seqops); } -static struct file_operations ima_ascii_measurements_ops = { +static const struct file_operations ima_ascii_measurements_ops = { .open = ima_ascii_measurements_open, .read = seq_read, .llseek = seq_lseek,
@@ -313,7 +313,7 @@ static int ima_release_policy(struct inode *inode, struct file *file)return 0 ; } -static struct file_operations ima_measure_policy_ops = { +static const struct file_operations ima_measure_policy_ops = { .open = ima_open_policy, .write = ima_write_policy, .release = ima_release_policy
Re: [PATCH] const: constify remaining file_operations
Quoted 2 lines · Alexey Dobriyan
arch/blackfin/mach-bf561/coreb.c | 2 -
drivers/char/bfin-otp.c| 2 -
these look fine to me, thanks
Acked-by Mike Frysinger <[email protected]>
-mike