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

7 files changed, 30 insertions, 30 deletions

diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c
index 56fb26127fef..577cff24707b 100644
--- a/fs/configfs/dir.c
+++ b/fs/configfs/dir.c
@@ -584,7 +584,7 @@ static void detach_attrs(struct config_item * item)
 
 static int populate_attrs(struct config_item *item)
 {
-        struct config_item_type *t = item->ci_type;
+        const struct config_item_type *t = item->ci_type;
         struct configfs_attribute *attr;
         struct configfs_bin_attribute *bin_attr;
         int error = 0;
@@ -901,7 +901,7 @@ static void configfs_detach_group(struct config_item *item)
 static void client_disconnect_notify(struct config_item *parent_item,
                                      struct config_item *item)
 {
-        struct config_item_type *type;
+        const struct config_item_type *type;
 
         type = parent_item->ci_type;
         BUG_ON(!type);
@@ -920,7 +920,7 @@ static void client_disconnect_notify(struct config_item *parent_item,
 static void client_drop_item(struct config_item *parent_item,
                              struct config_item *item)
 {
-        struct config_item_type *type;
+        const struct config_item_type *type;
 
         type = parent_item->ci_type;
         BUG_ON(!type);
@@ -1260,7 +1260,7 @@ static int configfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode
         struct config_item *parent_item;
         struct configfs_subsystem *subsys;
         struct configfs_dirent *sd;
-        struct config_item_type *type;
+        const struct config_item_type *type;
         struct module *subsys_owner = NULL, *new_item_owner = NULL;
         char *name;
 
@@ -1810,7 +1810,7 @@ EXPORT_SYMBOL(configfs_unregister_group);
 struct config_group *
 configfs_register_default_group(struct config_group *parent_group,
                                 const char *name,
-                                struct config_item_type *item_type)
+                                const struct config_item_type *item_type)
 {
         int ret;
         struct config_group *group;
diff --git a/fs/configfs/file.c b/fs/configfs/file.c
index 39da1103d341..62580dba3552 100644
--- a/fs/configfs/file.c
+++ b/fs/configfs/file.c
@@ -166,7 +166,7 @@ configfs_read_bin_file(struct file *file, char __user *buf,
                 retval = -ETXTBSY;
                 goto out;
         }
-        buffer->read_in_progress = 1;
+        buffer->read_in_progress = true;
 
         if (buffer->needs_read_fill) {
                 /* perform first read with buf == NULL to get extent */
@@ -325,7 +325,7 @@ configfs_write_bin_file(struct file *file, const char __user *buf,
                 len = -ETXTBSY;
                 goto out;
         }
-        buffer->write_in_progress = 1;
+        buffer->write_in_progress = true;
 
         /* buffer grows? */
         if (*ppos + count > buffer->bin_buffer_size) {
@@ -429,8 +429,8 @@ static int check_perm(struct inode * inode, struct file * file, int type)
         }
         mutex_init(&buffer->mutex);
         buffer->needs_read_fill = 1;
-        buffer->read_in_progress = 0;
-        buffer->write_in_progress = 0;
+        buffer->read_in_progress = false;
+        buffer->write_in_progress = false;
         buffer->ops = ops;
         file->private_data = buffer;
         goto Done;
@@ -488,10 +488,10 @@ static int configfs_release_bin_file(struct inode *inode, struct file *filp)
         ssize_t len = 0;
         int ret;
 
-        buffer->read_in_progress = 0;
+        buffer->read_in_progress = false;
 
         if (buffer->write_in_progress) {
-                buffer->write_in_progress = 0;
+                buffer->write_in_progress = false;
 
                 len = bin_attr->write(item, buffer->bin_buffer,
                                 buffer->bin_buffer_size);
diff --git a/fs/configfs/item.c b/fs/configfs/item.c
index a66f6624d899..88f266efc09b 100644
--- a/fs/configfs/item.c
+++ b/fs/configfs/item.c
@@ -113,7 +113,7 @@ EXPORT_SYMBOL(config_item_set_name);
 
 void config_item_init_type_name(struct config_item *item,
                                 const char *name,
-                                struct config_item_type *type)
+                                const struct config_item_type *type)
 {
         config_item_set_name(item, "%s", name);
         item->ci_type = type;
@@ -122,7 +122,7 @@ void config_item_init_type_name(struct config_item *item,
 EXPORT_SYMBOL(config_item_init_type_name);
 
 void config_group_init_type_name(struct config_group *group, const char *name,
-                         struct config_item_type *type)
+                         const struct config_item_type *type)
 {
         config_item_set_name(&group->cg_item, "%s", name);
         group->cg_item.ci_type = type;
@@ -148,7 +148,7 @@ EXPORT_SYMBOL(config_item_get_unless_zero);
 
 static void config_item_cleanup(struct config_item *item)
 {
-        struct config_item_type *t = item->ci_type;
+        const struct config_item_type *t = item->ci_type;
         struct config_group *s = item->ci_group;
         struct config_item *parent = item->ci_parent;
 
diff --git a/fs/configfs/symlink.c b/fs/configfs/symlink.c
index c8aabba502f6..78ffc2699993 100644
--- a/fs/configfs/symlink.c
+++ b/fs/configfs/symlink.c
@@ -138,7 +138,7 @@ int configfs_symlink(struct inode *dir, struct dentry *dentry, const char *symna
         struct configfs_dirent *sd;
         struct config_item *parent_item;
         struct config_item *target_item = NULL;
-        struct config_item_type *type;
+        const struct config_item_type *type;
 
         sd = dentry->d_parent->d_fsdata;
         /*
@@ -186,7 +186,7 @@ int configfs_unlink(struct inode *dir, struct dentry *dentry)
         struct configfs_dirent *sd = dentry->d_fsdata;
         struct configfs_symlink *sl;
         struct config_item *parent_item;
-        struct config_item_type *type;
+        const struct config_item_type *type;
         int ret;
 
         ret = -EPERM;  /* What lack-of-symlink returns */
diff --git a/fs/dlm/config.c b/fs/dlm/config.c
index 7211e826d90d..1270551d24e3 100644
--- a/fs/dlm/config.c
+++ b/fs/dlm/config.c
@@ -282,44 +282,44 @@ static struct configfs_item_operations node_ops = {
         .release = release_node,
 };
 
-static struct config_item_type clusters_type = {
+static const struct config_item_type clusters_type = {
         .ct_group_ops = &clusters_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type cluster_type = {
+static const struct config_item_type cluster_type = {
         .ct_item_ops = &cluster_ops,
         .ct_attrs = cluster_attrs,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type spaces_type = {
+static const struct config_item_type spaces_type = {
         .ct_group_ops = &spaces_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type space_type = {
+static const struct config_item_type space_type = {
         .ct_item_ops = &space_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type comms_type = {
+static const struct config_item_type comms_type = {
         .ct_group_ops = &comms_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type comm_type = {
+static const struct config_item_type comm_type = {
         .ct_item_ops = &comm_ops,
         .ct_attrs = comm_attrs,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type nodes_type = {
+static const struct config_item_type nodes_type = {
         .ct_group_ops = &nodes_ops,
         .ct_owner = THIS_MODULE,
 };
 
-static struct config_item_type node_type = {
+static const struct config_item_type node_type = {
         .ct_item_ops = &node_ops,
         .ct_attrs = node_attrs,
         .ct_owner = THIS_MODULE,
diff --git a/fs/ocfs2/cluster/heartbeat.c b/fs/ocfs2/cluster/heartbeat.c
index d0206042d068..ea8c551bcd7e 100644
--- a/fs/ocfs2/cluster/heartbeat.c
+++ b/fs/ocfs2/cluster/heartbeat.c
@@ -2025,7 +2025,7 @@ static struct configfs_item_operations o2hb_region_item_ops = {
         .release                = o2hb_region_release,
 };
 
-static struct config_item_type o2hb_region_type = {
+static const struct config_item_type o2hb_region_type = {
         .ct_item_ops    = &o2hb_region_item_ops,
         .ct_attrs       = o2hb_region_attrs,
         .ct_owner       = THIS_MODULE,
@@ -2310,7 +2310,7 @@ static struct configfs_group_operations o2hb_heartbeat_group_group_ops = {
         .drop_item      = o2hb_heartbeat_group_drop_item,
 };
 
-static struct config_item_type o2hb_heartbeat_group_type = {
+static const struct config_item_type o2hb_heartbeat_group_type = {
         .ct_group_ops   = &o2hb_heartbeat_group_group_ops,
         .ct_attrs       = o2hb_heartbeat_group_attrs,
         .ct_owner       = THIS_MODULE,
diff --git a/fs/ocfs2/cluster/nodemanager.c b/fs/ocfs2/cluster/nodemanager.c
index b17d180bdc16..a51200ece93d 100644
--- a/fs/ocfs2/cluster/nodemanager.c
+++ b/fs/ocfs2/cluster/nodemanager.c
@@ -378,7 +378,7 @@ static struct configfs_item_operations o2nm_node_item_ops = {
         .release                = o2nm_node_release,
 };
 
-static struct config_item_type o2nm_node_type = {
+static const struct config_item_type o2nm_node_type = {
         .ct_item_ops    = &o2nm_node_item_ops,
         .ct_attrs       = o2nm_node_attrs,
         .ct_owner       = THIS_MODULE,
@@ -619,7 +619,7 @@ static struct configfs_group_operations o2nm_node_group_group_ops = {
         .drop_item      = o2nm_node_group_drop_item,
 };
 
-static struct config_item_type o2nm_node_group_type = {
+static const struct config_item_type o2nm_node_group_type = {
         .ct_group_ops   = &o2nm_node_group_group_ops,
         .ct_owner       = THIS_MODULE,
 };
@@ -637,7 +637,7 @@ static struct configfs_item_operations o2nm_cluster_item_ops = {
         .release        = o2nm_cluster_release,
 };
 
-static struct config_item_type o2nm_cluster_type = {
+static const struct config_item_type o2nm_cluster_type = {
         .ct_item_ops    = &o2nm_cluster_item_ops,
         .ct_attrs       = o2nm_cluster_attrs,
         .ct_owner       = THIS_MODULE,
@@ -722,7 +722,7 @@ static struct configfs_group_operations o2nm_cluster_group_group_ops = {
         .drop_item      = o2nm_cluster_group_drop_item,
 };
 
-static struct config_item_type o2nm_cluster_group_type = {
+static const struct config_item_type o2nm_cluster_group_type = {
         .ct_group_ops   = &o2nm_cluster_group_group_ops,
         .ct_owner       = THIS_MODULE,
 };