diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-05 08:59:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-12-05 08:59:41 -0800 |
| commit | 5d45c729edd34eae25987b45bb5e0c5a534a9f5b (patch) | |
| tree | 198d7e3b3c1f27ca0ee41d23f18a2c85663e1969 | |
| parent | 2061f18ad76ecaddf8ed17df81b8611ea88dbddd (diff) | |
| parent | f7f78098690d60a03b47942ac7d73ea17b42239e (diff) | |
Merge tag 'configfs-for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux
Pull configfs updates from Andreas Hindborg:
"Two commits changing constness of the configfs vtable pointers. We
plan to follow up with changes at call sites down the road"
* tag 'configfs-for-v6.19' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux:
configfs: Constify ct_item_ops in struct config_item_type
configfs: Constify ct_group_ops in struct config_item_type
| -rw-r--r-- | fs/configfs/dir.c | 2 | ||||
| -rw-r--r-- | fs/configfs/file.c | 2 | ||||
| -rw-r--r-- | include/linux/configfs.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index 81f4f06bc87e..4bcd14b3434c 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c @@ -598,7 +598,7 @@ static void detach_attrs(struct config_item * item) static int populate_attrs(struct config_item *item) { const struct config_item_type *t = item->ci_type; - struct configfs_group_operations *ops; + const struct configfs_group_operations *ops; struct configfs_attribute *attr; struct configfs_bin_attribute *bin_attr; int error = 0; diff --git a/fs/configfs/file.c b/fs/configfs/file.c index 0ad32150611e..affe4742bbb5 100644 --- a/fs/configfs/file.c +++ b/fs/configfs/file.c @@ -30,7 +30,7 @@ struct configfs_buffer { size_t count; loff_t pos; char * page; - struct configfs_item_operations * ops; + const struct configfs_item_operations *ops; struct mutex mutex; int needs_read_fill; bool read_in_progress; diff --git a/include/linux/configfs.h b/include/linux/configfs.h index 698520b1bfdb..ef65c75beeaa 100644 --- a/include/linux/configfs.h +++ b/include/linux/configfs.h @@ -64,8 +64,8 @@ extern void config_item_put(struct config_item *); struct config_item_type { struct module *ct_owner; - struct configfs_item_operations *ct_item_ops; - struct configfs_group_operations *ct_group_ops; + const struct configfs_item_operations *ct_item_ops; + const struct configfs_group_operations *ct_group_ops; struct configfs_attribute **ct_attrs; struct configfs_bin_attribute **ct_bin_attrs; }; |