diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
| commit | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (patch) | |
| tree | b0f7a9bbf7b64727a0f1b35f70ead1a4d2809736 /c08.patch | |
| parent | 7d9e0d94f09501482a336a7a2e692c159ec4c9a9 (diff) | |
| download | patches-40a2bc5b5c03c7219f40be1f5be51089a156b974.tar.gz | |
refresh and move some patches out of the main queue
Diffstat (limited to 'c08.patch')
| -rw-r--r-- | c08.patch | 77 |
1 files changed, 0 insertions, 77 deletions
diff --git a/c08.patch b/c08.patch deleted file mode 100644 index 0f5b92fa40e06a..00000000000000 --- a/c08.patch +++ /dev/null @@ -1,77 +0,0 @@ ---- - drivers/block/osdblk.c | 32 ++++++++++++++++---------------- - 1 file changed, 16 insertions(+), 16 deletions(-) - ---- a/drivers/block/osdblk.c -+++ b/drivers/block/osdblk.c -@@ -462,9 +462,8 @@ static void class_osdblk_release(struct - kfree(cls); - } - --static ssize_t class_osdblk_list(struct class *c, -- struct class_attribute *attr, -- char *data) -+static ssize_t list_show(struct class *c, struct class_attribute *attr, -+ char *data) - { - int n = 0; - struct list_head *tmp; -@@ -487,10 +486,10 @@ static ssize_t class_osdblk_list(struct - mutex_unlock(&ctl_mutex); - return n; - } -+static CLASS_ATTR_RO(list); - --static ssize_t class_osdblk_add(struct class *c, -- struct class_attribute *attr, -- const char *buf, size_t count) -+static ssize_t add_store(struct class *c, struct class_attribute *attr, -+ const char *buf, size_t count) - { - struct osdblk_device *osdev; - ssize_t rc; -@@ -581,11 +580,10 @@ err_out_mod: - module_put(THIS_MODULE); - return rc; - } -+static CLASS_ATTR_WO(add); - --static ssize_t class_osdblk_remove(struct class *c, -- struct class_attribute *attr, -- const char *buf, -- size_t count) -+static ssize_t remove_store(struct class *c, struct class_attribute *attr, -+ const char *buf, size_t count) - { - struct osdblk_device *osdev = NULL; - int target_id, rc; -@@ -629,13 +627,15 @@ static ssize_t class_osdblk_remove(struc - - return count; - } -+static CLASS_ATTR_WO(remove); - --static struct class_attribute class_osdblk_attrs[] = { -- __ATTR(add, 0200, NULL, class_osdblk_add), -- __ATTR(remove, 0200, NULL, class_osdblk_remove), -- __ATTR(list, 0444, class_osdblk_list, NULL), -- __ATTR_NULL -+static struct attribute *class_osdblk_attrs[] = { -+ &class_attr_list.attr, -+ &class_attr_remove.attr, -+ &class_attr_list.attr, -+ NULL, - }; -+ATTRIBUTE_GROUPS(class_osdblk); - - static int osdblk_sysfs_init(void) - { -@@ -652,7 +652,7 @@ static int osdblk_sysfs_init(void) - class_osdblk->name = DRV_NAME; - class_osdblk->owner = THIS_MODULE; - class_osdblk->class_release = class_osdblk_release; -- class_osdblk->class_attrs = class_osdblk_attrs; -+ class_osdblk->class_groups = class_osdblk_groups; - - ret = class_register(class_osdblk); - if (ret) { |