diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 14:44:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-11-14 14:44:04 -0800 |
| commit | abc36be236358162202e86ad88616ff95a755101 (patch) | |
| tree | cbb14c01e837fa2c82fb271337e333a5e393b850 /drivers/block | |
| parent | f14fc0ccee5521e5b38cdd1df4385d32c6e1805b (diff) | |
| parent | 6ace4f6bbcfde70278a33c11443ecda3ed0ec1b6 (diff) | |
| download | linux-rt-abc36be236358162202e86ad88616ff95a755101.tar.gz | |
Merge tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs
Pull configfs updates from Christoph Hellwig:
"A couple of configfs cleanups:
- proper use of the bool type (Thomas Meyer)
- constification of struct config_item_type (Bhumika Goyal)"
* tag 'configfs-for-4.15' of git://git.infradead.org/users/hch/configfs:
RDMA/cma: make config_item_type const
stm class: make config_item_type const
ACPI: configfs: make config_item_type const
nvmet: make config_item_type const
usb: gadget: configfs: make config_item_type const
PCI: endpoint: make config_item_type const
iio: make function argument and some structures const
usb: gadget: make config_item_type structures const
dlm: make config_item_type const
netconsole: make config_item_type const
nullb: make config_item_type const
ocfs2/cluster: make config_item_type const
target: make config_item_type const
configfs: make ci_type field, some pointers and function arguments const
configfs: make config_item_type const
configfs: Fix bool initialization/comparison
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/null_blk.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/null_blk.c b/drivers/block/null_blk.c index 8042c26ea9e6..cda69dbefe3b 100644 --- a/drivers/block/null_blk.c +++ b/drivers/block/null_blk.c @@ -476,7 +476,7 @@ static struct configfs_item_operations nullb_device_ops = { .release = nullb_device_release, }; -static struct config_item_type nullb_device_type = { +static const struct config_item_type nullb_device_type = { .ct_item_ops = &nullb_device_ops, .ct_attrs = nullb_device_attrs, .ct_owner = THIS_MODULE, @@ -528,7 +528,7 @@ static struct configfs_group_operations nullb_group_ops = { .drop_item = nullb_group_drop_item, }; -static struct config_item_type nullb_group_type = { +static const struct config_item_type nullb_group_type = { .ct_group_ops = &nullb_group_ops, .ct_attrs = nullb_group_attrs, .ct_owner = THIS_MODULE, |