Skip to content

Commit 5d45c72

Browse files
committed
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
2 parents 2061f18 + f7f7809 commit 5d45c72

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

fs/configfs/dir.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,7 +598,7 @@ static void detach_attrs(struct config_item * item)
598598
static int populate_attrs(struct config_item *item)
599599
{
600600
const struct config_item_type *t = item->ci_type;
601-
struct configfs_group_operations *ops;
601+
const struct configfs_group_operations *ops;
602602
struct configfs_attribute *attr;
603603
struct configfs_bin_attribute *bin_attr;
604604
int error = 0;

fs/configfs/file.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct configfs_buffer {
3030
size_t count;
3131
loff_t pos;
3232
char * page;
33-
struct configfs_item_operations * ops;
33+
const struct configfs_item_operations *ops;
3434
struct mutex mutex;
3535
int needs_read_fill;
3636
bool read_in_progress;

include/linux/configfs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ extern void config_item_put(struct config_item *);
6464

6565
struct config_item_type {
6666
struct module *ct_owner;
67-
struct configfs_item_operations *ct_item_ops;
68-
struct configfs_group_operations *ct_group_ops;
67+
const struct configfs_item_operations *ct_item_ops;
68+
const struct configfs_group_operations *ct_group_ops;
6969
struct configfs_attribute **ct_attrs;
7070
struct configfs_bin_attribute **ct_bin_attrs;
7171
};

0 commit comments

Comments
 (0)