Merge tag 'configfs-for-4.10' of git://git.infradead.org/users/hch/configfs

Pull configfs update from Christoph Hellwig:
 "Just one simple change from Andrzej to drop the pointless return value
  from the ->drop_link method"

* tag 'configfs-for-4.10' of git://git.infradead.org/users/hch/configfs:
  fs: configfs: don't return anything from drop_link

diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt
index 8ec9136aae56cedb6de6d7b37d2e7df6ccef656b..3828e85345ae3f8a41e56adaddc442e648c9be7b 100644 (file)
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
@@ -174,7 +174,7 @@ among other things.  For that, it needs a type.
                void (*release)(struct config_item *);
                int (*allow_link)(struct config_item *src,
                                  struct config_item *target);
-               int (*drop_link)(struct config_item *src,
+               void (*drop_link)(struct config_item *src,
                                 struct config_item *target);
        };
 

diff --git a/drivers/nvme/target/configfs.c b/drivers/nvme/target/configfs.c
index d0f60c36d5767e1aad481039ac05382a4c93f198..6f5074153dcd9ea921f35751bbd622c18f227e49 100644 (file)
--- a/drivers/nvme/target/configfs.c
+++ b/drivers/nvme/target/configfs.c
@@ -480,7 +480,7 @@ out_free_link:
        return ret;
 }
 
-static int nvmet_port_subsys_drop_link(struct config_item *parent,
+static void nvmet_port_subsys_drop_link(struct config_item *parent,
                struct config_item *target)
 {
        struct nvmet_port *port = to_nvmet_port(parent->ci_parent);
@@ -493,7 +493,7 @@ static int nvmet_port_subsys_drop_link(struct config_item *parent,
                        goto found;
        }
        up_write(&nvmet_config_sem);
-       return -EINVAL;
+       return;
 
 found:
        list_del(&p->entry);
@@ -502,7 +502,6 @@ found:
                nvmet_disable_port(port);
        up_write(&nvmet_config_sem);
        kfree(p);
-       return 0;
 }
 
 static struct configfs_item_operations nvmet_port_subsys_item_ops = {
@@ -556,7 +555,7 @@ out_free_link:
        return ret;
 }
 
-static int nvmet_allowed_hosts_drop_link(struct config_item *parent,
+static void nvmet_allowed_hosts_drop_link(struct config_item *parent,
                struct config_item *target)
 {
        struct nvmet_subsys *subsys = to_subsys(parent->ci_parent);
@@ -569,14 +568,13 @@ static int nvmet_allowed_hosts_drop_link(struct config_item *parent,
                        goto found;
        }
        up_write(&nvmet_config_sem);
-       return -EINVAL;
+       return;
 
 found:
        list_del(&p->entry);
        nvmet_genctr++;
        up_write(&nvmet_config_sem);
        kfree(p);
-       return 0;
 }
 
 static struct configfs_item_operations nvmet_allowed_hosts_item_ops = {

diff --git a/drivers/target/target_core_fabric_configfs.c b/drivers/target/target_core_fabric_configfs.c
index 31a096aa16aba6dc4239cd412f813709709723f8..d8a16ca6baa507b235cbec2fbff56a648874fd2e 100644 (file)
--- a/drivers/target/target_core_fabric_configfs.c
+++ b/drivers/target/target_core_fabric_configfs.c
@@ -137,7 +137,7 @@ static int target_fabric_mappedlun_link(
        return core_dev_add_initiator_node_lun_acl(se_tpg, lacl, lun, lun_access_ro);
 }
 
-static int target_fabric_mappedlun_unlink(
+static void target_fabric_mappedlun_unlink(
        struct config_item *lun_acl_ci,
        struct config_item *lun_ci)
 {
@@ -146,7 +146,7 @@ static int target_fabric_mappedlun_unlink(
        struct se_lun *lun = container_of(to_config_group(lun_ci),
                        struct se_lun, lun_group);
 
-       return core_dev_del_initiator_node_lun_acl(lun, lacl);
+       core_dev_del_initiator_node_lun_acl(lun, lacl);
 }
 
 static struct se_lun_acl *item_to_lun_acl(struct config_item *item)
@@ -669,7 +669,7 @@ out:
        return ret;
 }
 
-static int target_fabric_port_unlink(
+static void target_fabric_port_unlink(
        struct config_item *lun_ci,
        struct config_item *se_dev_ci)
 {
@@ -688,7 +688,6 @@ static int target_fabric_port_unlink(
        }
 
        core_dev_del_lun(se_tpg, lun);
-       return 0;
 }
 
 static void target_fabric_port_release(struct config_item *item)

diff --git a/drivers/usb/gadget/configfs.c b/drivers/usb/gadget/configfs.c
index 3984787f8e9720933830864200196b32930e10b4..78c44979dde382ca8c58e9f9f84024180ce9663d 100644 (file)
--- a/drivers/usb/gadget/configfs.c
+++ b/drivers/usb/gadget/configfs.c
@@ -408,7 +408,7 @@ out:
        return ret;
 }
 
-static int config_usb_cfg_unlink(
+static void config_usb_cfg_unlink(
        struct config_item *usb_cfg_ci,
        struct config_item *usb_func_ci)
 {
@@ -437,12 +437,11 @@ static int config_usb_cfg_unlink(
                        list_del(&f->list);
                        usb_put_function(f);
                        mutex_unlock(&gi->lock);
-                       return 0;
+                       return;
                }
        }
        mutex_unlock(&gi->lock);
        WARN(1, "Unable to locate function to unbind\n");
-       return 0;
 }
 
 static struct configfs_item_operations gadget_config_item_ops = {
@@ -865,7 +864,7 @@ out:
        return ret;
 }
 
-static int os_desc_unlink(struct config_item *os_desc_ci,
+static void os_desc_unlink(struct config_item *os_desc_ci,
                          struct config_item *usb_cfg_ci)
 {
        struct gadget_info *gi = container_of(to_config_group(os_desc_ci),
@@ -878,7 +877,6 @@ static int os_desc_unlink(struct config_item *os_desc_ci,
        cdev->os_desc_config = NULL;
        WARN_ON(gi->composite.gadget_driver.udc_name);
        mutex_unlock(&gi->lock);
-       return 0;
 }
 
 static struct configfs_item_operations os_desc_ops = {

diff --git a/drivers/usb/gadget/function/uvc_configfs.c b/drivers/usb/gadget/function/uvc_configfs.c
index 31125a4a2658938cdc67ef4b24ee9bfbfeeadf44..4e037d2a7a60c3eefdd9f6585def29b23c02984b 100644 (file)
--- a/drivers/usb/gadget/function/uvc_configfs.c
+++ b/drivers/usb/gadget/function/uvc_configfs.c
@@ -547,7 +547,7 @@ out:
        return ret;
 }
 
-static int uvcg_control_class_drop_link(struct config_item *src,
+static void uvcg_control_class_drop_link(struct config_item *src,
                                        struct config_item *target)
 {
        struct config_item *control, *header;
@@ -555,7 +555,6 @@ static int uvcg_control_class_drop_link(struct config_item *src,
        struct mutex *su_mutex = &src->ci_group->cg_subsys->su_mutex;
        struct uvc_descriptor_header **class_array;
        struct uvcg_control_header *target_hdr;
-       int ret = -EINVAL;
 
        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
 
@@ -569,23 +568,17 @@ static int uvcg_control_class_drop_link(struct config_item *src,
        mutex_lock(&opts->lock);
 
        class_array = uvcg_get_ctl_class_arr(src, opts);
-       if (!class_array)
-               goto unlock;
-       if (opts->refcnt) {
-               ret = -EBUSY;
+       if (!class_array || opts->refcnt)
                goto unlock;
-       }
 
        target_hdr = to_uvcg_control_header(target);
        --target_hdr->linked;
        class_array[0] = NULL;
-       ret = 0;
 
 unlock:
        mutex_unlock(&opts->lock);
 out:
        mutex_unlock(su_mutex);
-       return ret;
 }
 
 static struct configfs_item_operations uvcg_control_class_item_ops = {
@@ -777,7 +770,7 @@ out:
        return ret;
 }
 
-static int uvcg_streaming_header_drop_link(struct config_item *src,
+static void uvcg_streaming_header_drop_link(struct config_item *src,
                                           struct config_item *target)
 {
        struct mutex *su_mutex = &src->ci_group->cg_subsys->su_mutex;
@@ -786,7 +779,6 @@ static int uvcg_streaming_header_drop_link(struct config_item *src,
        struct uvcg_streaming_header *src_hdr;
        struct uvcg_format *target_fmt = NULL;
        struct uvcg_format_ptr *format_ptr, *tmp;
-       int ret = -EINVAL;
 
        src_hdr = to_uvcg_streaming_header(src);
        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
@@ -811,8 +803,6 @@ static int uvcg_streaming_header_drop_link(struct config_item *src,
 out:
        mutex_unlock(&opts->lock);
        mutex_unlock(su_mutex);
-       return ret;
-
 }
 
 static struct configfs_item_operations uvcg_streaming_header_item_ops = {
@@ -2051,7 +2041,7 @@ out:
        return ret;
 }
 
-static int uvcg_streaming_class_drop_link(struct config_item *src,
+static void uvcg_streaming_class_drop_link(struct config_item *src,
                                          struct config_item *target)
 {
        struct config_item *streaming, *header;
@@ -2059,7 +2049,6 @@ static int uvcg_streaming_class_drop_link(struct config_item *src,
        struct mutex *su_mutex = &src->ci_group->cg_subsys->su_mutex;
        struct uvc_descriptor_header ***class_array;
        struct uvcg_streaming_header *target_hdr;
-       int ret = -EINVAL;
 
        mutex_lock(su_mutex); /* for navigating configfs hierarchy */
 
@@ -2076,23 +2065,19 @@ static int uvcg_streaming_class_drop_link(struct config_item *src,
        if (!class_array || !*class_array)
                goto unlock;
 
-       if (opts->refcnt) {
-               ret = -EBUSY;
+       if (opts->refcnt)
                goto unlock;
-       }
 
        target_hdr = to_uvcg_streaming_header(target);
        --target_hdr->linked;
        kfree(**class_array);
        kfree(*class_array);
        *class_array = NULL;
-       ret = 0;
 
 unlock:
        mutex_unlock(&opts->lock);
 out:
        mutex_unlock(su_mutex);
-       return ret;
 }
 
 static struct configfs_item_operations uvcg_streaming_class_item_ops = {

diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index d9d6a9d77489a72ef30519c67b08e046a0e81b46..9a30b921f7401487cb6238b9bcb6e9f096e9a39f 100644 (file)
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -228,7 +228,7 @@ static struct configfs_bin_attribute _pfx##attr_##_name = { \
 struct configfs_item_operations {
        void (*release)(struct config_item *);
        int (*allow_link)(struct config_item *src, struct config_item *target);
-       int (*drop_link)(struct config_item *src, struct config_item *target);
+       void (*drop_link)(struct config_item *src, struct config_item *target);
 };
 
 struct configfs_group_operations {