Constify struct sysfs_ops for 2.6.32-git-053fe57ac v2
Subsystems (7)
PATCH 5/25 Constify struct sysfs_ops for 2.6.32-git-053fe57ac v2
In reply to [email protected]From: Emese Revfy <[email protected]>
--- drivers/base/bus.c | 4 ++-- drivers/base/class.c | 2 +- drivers/base/core.c | 2 +- drivers/base/sys.c | 4 ++-- fs/sysfs/file.c | 8 ++++---- include/linux/kobject.h | 4 ++-- lib/kobject.c | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-)
drivers/base/bus.c +2 -2
@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kobject *kobj, struct attribute *attr,return ret; } -static struct sysfs_ops driver_sysfs_ops = { +static const struct sysfs_ops driver_sysfs_ops = { .show = drv_attr_show, .store = drv_attr_store, };
@@ -115,7 +115,7 @@ static ssize_t bus_attr_store(struct kobject *kobj, struct attribute *attr,return ret; } -static struct sysfs_ops bus_sysfs_ops = { +static const struct sysfs_ops bus_sysfs_ops = { .show = bus_attr_show, .store = bus_attr_store, };
drivers/base/class.c +1 -1
@@ -61,7 +61,7 @@ static void class_release(struct kobject *kobj) "be careful\n", class->name); } -static struct sysfs_ops class_sysfs_ops = { +static const struct sysfs_ops class_sysfs_ops = { .show = class_attr_show, .store = class_attr_store, };
drivers/base/core.c +1 -1
@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kobject *kobj, struct attribute *attr,return ret; } -static struct sysfs_ops dev_sysfs_ops = { +static const struct sysfs_ops dev_sysfs_ops = { .show = dev_attr_show, .store = dev_attr_store, };
drivers/base/sys.c +2 -2
@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struct attribute *attr,return -EIO ; } -static struct sysfs_ops sysfs_ops = { +static const struct sysfs_ops sysfs_ops = { .show = sysdev_show, .store = sysdev_store, };
@@ -104,7 +104,7 @@ static ssize_t sysdev_class_store(struct kobject *kobj, struct attribute *attr,return -EIO ; } -static struct sysfs_ops sysfs_class_ops = { +static const struct sysfs_ops sysfs_class_ops = { .show = sysdev_class_show, .store = sysdev_class_store, };
fs/sysfs/file.c +4 -4
@@ -53,7 +53,7 @@ struct sysfs_buffer {size_t count;loff_t pos;char * page; -struct sysfs_ops * ops; +const struct sysfs_ops * ops;struct mutex mutex;int needs_read_fill;int event;
@@ -75,7 +75,7 @@ static int fill_read_buffer(struct dentry * dentry, struct sysfs_buffer * buffer {struct sysfs_dirent *attr_sd = dentry->d_fsdata;struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; -struct sysfs_ops * ops = buffer->ops; +const struct sysfs_ops * ops = buffer->ops;int ret =0 ;ssize_t count;
@@ -199,7 +199,7 @@ flush_write_buffer(struct dentry * dentry, struct sysfs_buffer * buffer, size_t {struct sysfs_dirent *attr_sd = dentry->d_fsdata;struct kobject *kobj = attr_sd->s_parent->s_dir.kobj; -struct sysfs_ops * ops = buffer->ops; +const struct sysfs_ops * ops = buffer->ops;int rc;/* need attr_sd for attr and ops, its parent for kobj */
@@ -335,7 +335,7 @@ static int sysfs_open_file(struct inode *inode, struct file *file)struct sysfs_dirent *attr_sd = file->f_path.dentry->d_fsdata;struct kobject *kobj = attr_sd->s_parent->s_dir.kobj;struct sysfs_buffer *buffer; -struct sysfs_ops *ops; +const struct sysfs_ops *ops;int error = -EACCES ;char *p;
include/linux/kobject.h +2 -2
@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kobject *kobj, gfp_t flag);struct kobj_type {void (*release)(struct kobject *kobj); -struct sysfs_ops *sysfs_ops; +const struct sysfs_ops *sysfs_ops;struct attribute **default_attrs; };
@@ -132,7 +132,7 @@ struct kobj_attribute { const char *buf, size_t count); }; -extern struct sysfs_ops kobj_sysfs_ops; +extern const struct sysfs_ops kobj_sysfs_ops;/** * struct kset - a set of kobjects of a specific type, belonging to a specific subsystem.
lib/kobject.c +1 -1
@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct kobject *kobj, struct attribute *attr,return ret; } -struct sysfs_ops kobj_sysfs_ops = { +const struct sysfs_ops kobj_sysfs_ops = { .show = kobj_attr_show, .store = kobj_attr_store, };
Signature · 1 line
1.6.5.3
PATCH 2/25 Constify struct sysfs_ops for 2.6.32-git-053fe57ac v2
In reply to [email protected]From: Emese Revfy <[email protected]>
--- fs/btrfs/sysfs.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/sysfs.c +2 -2
@@ -164,12 +164,12 @@ static void btrfs_root_release(struct kobject *kobj)complete (&root->kobj_unregister); } -static struct sysfs_ops btrfs_super_attr_ops = { +static const struct sysfs_ops btrfs_super_attr_ops = { .show = btrfs_super_attr_show, .store = btrfs_super_attr_store, }; -static struct sysfs_ops btrfs_root_attr_ops = { +static const struct sysfs_ops btrfs_root_attr_ops = { .show = btrfs_root_attr_show, .store = btrfs_root_attr_store, };
Signature · 1 line
1.6.5.3
PATCH 4/25 Constify struct sysfs_ops for 2.6.32-git-053fe57ac v2
In reply to [email protected]From: Emese Revfy <[email protected]>
--- fs/dlm/lockspace.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
fs/dlm/lockspace.c +1 -1
@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struct kobject *k)kfree (ls); } -static struct sysfs_ops dlm_attr_ops = { +static const struct sysfs_ops dlm_attr_ops = { .show = dlm_attr_show, .store = dlm_attr_store, };
Signature · 1 line
1.6.5.3
PATCH 3/25 Constify struct sysfs_ops for 2.6.32-git-053fe57ac v2
In reply to [email protected]From: Emese Revfy <[email protected]>
--- drivers/cpufreq/cpufreq.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/cpufreq/cpufreq.c +1 -1
@@ -766,7 +766,7 @@ static void cpufreq_sysfs_release(struct kobject *kobj)complete (&policy->kobj_unregister); } -static struct sysfs_ops sysfs_ops = { +static const struct sysfs_ops sysfs_ops = { .show = show, .store = store, };
Signature · 1 line
1.6.5.3
PATCH 1/25 Constify struct sysfs_ops for 2.6.32-git-053fe57ac v2
In reply to [email protected]From: Emese Revfy <[email protected]>
--- drivers/dma/ioat/dma.c | 2 +- drivers/dma/ioat/dma.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/dma/ioat/dma.c +1 -1
@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, struct attribute *attr, char *page)return entry->show (&chan->common, page); } -struct sysfs_ops ioat_sysfs_ops = { +const struct sysfs_ops ioat_sysfs_ops = { .show = ioat_attr_show, };
drivers/dma/ioat/dma.h +1 -1
@@ -329,7 +329,7 @@ bool ioat_cleanup_preamble(struct ioat_chan_common *chan, unsigned long *phys_complete);void ioat_kobject_add (struct ioatdma_device *device,struct kobj_type *type);void ioat_kobject_del (struct ioatdma_device *device); -extern struct sysfs_ops ioat_sysfs_ops; +extern const struct sysfs_ops ioat_sysfs_ops;extern struct ioat_sysfs_entry ioat_version_attr;extern struct ioat_sysfs_entry ioat_cap_attr;#endif /* IOATDMA_H */
Signature · 1 line
1.6.5.3
PATCH 1/2 Constify struct snd_ac97_build_ops for 2.6.32-git-053fe57ac v2
In reply to [email protected]From: Emese Revfy <[email protected]>
--- include/sound/ac97_codec.h | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
include/sound/ac97_codec.h +8 -8
@@ -419,15 +419,15 @@struct snd_ac97 ;struct snd_ac97_build_ops { -int (*build_3d) (struct snd_ac97 *ac97); -int (*build_specific) (struct snd_ac97 *ac97); -int (*build_spdif) (struct snd_ac97 *ac97); -int (*build_post_spdif) (struct snd_ac97 *ac97); +int (*const build_3d) (struct snd_ac97 *ac97); +int (*const build_specific) (struct snd_ac97 *ac97); +int (*const build_spdif) (struct snd_ac97 *ac97); +int (*const build_post_spdif) (struct snd_ac97 *ac97);#ifdef CONFIG_PM -void (*suspend) (struct snd_ac97 *ac97); -void (*resume) (struct snd_ac97 *ac97); +void (*const suspend) (struct snd_ac97 *ac97); +void (*const resume) (struct snd_ac97 *ac97);#endif -void (*update_jacks) (struct snd_ac97 *ac97);/* for jack-sharing */ +void (*const update_jacks) (struct snd_ac97 *ac97);/* for jack-sharing */ };struct snd_ac97_bus_ops {
@@ -477,7 +477,7 @@ struct snd_ac97_template {struct snd_ac97 {/* -- lowlevel (hardware) driver specific -- */ -struct snd_ac97_build_ops * build_ops; +const struct snd_ac97_build_ops * build_ops;void *private_data;void (*private_free) (struct snd_ac97 *ac97);/* --- */
Signature · 1 line
1.6.5.3
cover Constify struct sysfs_ops for 2.6.32-git-053fe57ac v2
From: Emese Revfy <[email protected]>
Hello everyone!
The following patch series attempts to constify several structures that hold function pointers. This is only the initial batch, there are about over 150 candidate structures, some of which can be constified as well, I plan to submit them in the future.
The list of constified structures in this series (* marks this thread):acpi_dock_opsaddress_space_operationsbacklight_opsblock_device_operationsdma_map_opsextent_io_opsfile_lock_operationsfile_operationshv_opsintel_dvo_dev_opsitem_operationsiwl_opskgdb_archkgdb_iokset_uevent_opslock_manager_operationsmicrocode_opsmtrr_opsneigh_opsnlmsvc_bindingpci_raw_opsplatform_hibernation_opsplatform_suspend_opssnd_ac97_build_ops
* sysfs_opsusb_mon_operationswd_ops
There are certain exceptions where a given instance of the structure cannot be const, they are marked with a comment in the patch.
The patches compile fine with an allyesconfig kernel on i386 and x86_64.
Please let me know if any of these structures should not be constified and any other issues you see with them.
Changelog:
----------
v1 -> v2
- updated to linus-git-053fe57
- extended comments with a reference to code that prevents constification
- split up patches by subsystem as suggested by Greg KH, Jiri Slaby
- added all Acked-by's received so far
- removed patch for super_operations for now
- removed patch for ptmx_fops
Thanks,
Emese
arch/ia64/kernel/topology.c | 2 +- arch/powerpc/kernel/cacheinfo.c | 2 +- arch/sh/kernel/cpu/sh4/sq.c | 2 +- arch/x86/kernel/cpu/intel_cacheinfo.c | 2 +- arch/x86/kernel/cpu/mcheck/mce_amd.c | 2 +- block/blk-integrity.c | 2 +- block/blk-sysfs.c | 2 +- block/elevator.c | 2 +- drivers/base/bus.c | 4 ++-- drivers/base/class.c | 2 +- drivers/base/core.c | 2 +- drivers/base/sys.c | 4 ++-- drivers/block/pktcdvd.c | 2 +- drivers/cpufreq/cpufreq.c | 2 +- drivers/cpuidle/sysfs.c | 4 ++-- drivers/dma/ioat/dma.c | 2 +- drivers/dma/ioat/dma.h | 2 +- drivers/edac/edac_device_sysfs.c | 6 +++--- drivers/edac/edac_mc_sysfs.c | 4 ++-- drivers/edac/edac_pci_sysfs.c | 4 ++-- drivers/firmware/edd.c | 2 +- drivers/firmware/efivars.c | 2 +- drivers/firmware/iscsi_ibft.c | 2 +- drivers/firmware/memmap.c | 2 +- drivers/gpu/drm/ttm/ttm_bo.c | 2 +- drivers/gpu/drm/ttm/ttm_memory.c | 2 +- drivers/infiniband/core/cm.c | 2 +- drivers/infiniband/core/sysfs.c | 2 +- drivers/md/dm-sysfs.c | 2 +- drivers/md/md.c | 4 ++-- drivers/net/ibmveth.c | 2 +- drivers/net/iseries_veth.c | 4 ++-- drivers/parisc/pdc_stable.c | 2 +- drivers/pci/hotplug/fakephp.c | 2 +- drivers/pci/slot.c | 2 +- drivers/uio/uio.c | 4 ++-- drivers/uwb/wlp/sysfs.c | 3 +-- drivers/video/omap2/dss/manager.c | 2 +- drivers/video/omap2/dss/overlay.c | 2 +- drivers/xen/sys-hypervisor.c | 2 +- fs/btrfs/sysfs.c | 4 ++-- fs/dlm/lockspace.c | 2 +- fs/ext4/super.c | 2 +- fs/gfs2/sys.c | 2 +- fs/ocfs2/cluster/masklog.c | 2 +- fs/sysfs/file.c | 8 ++++---- include/linux/kobject.h | 4 ++-- include/linux/sysfs.h | 4 ++-- kernel/params.c | 2 +- lib/kobject.c | 2 +- mm/slub.c | 2 +- net/bridge/br_private.h | 2 +- net/bridge/br_sysfs_if.c | 2 +- samples/kobject/kset-example.c | 2 +- 54 files changed, 70 insertions(+), 71 deletions(-)
PATCH 2/2 Constify struct snd_ac97_build_ops for 2.6.32-git-053fe57ac v2
From: Emese Revfy <[email protected]>
--- sound/pci/ac97/ac97_codec.c | 2 +- sound/pci/ac97/ac97_patch.c | 64 +++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 33 deletions(-)
sound/pci/ac97/ac97_codec.c +1 -1
@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struct snd_device *device) }/* build_ops to do nothing */ -static struct snd_ac97_build_ops null_build_ops; +static const struct snd_ac97_build_ops null_build_ops;#ifdef CONFIG_SND_AC97_POWER_SAVE static void do_update_power (struct work_struct *work)
sound/pci/ac97/ac97_patch.c +32 -32
256 lines not on this page · raw message
Signature · 1 line
1.6.5.3