diff options
author | Christoph Hellwig <hch@lst.de> | 2015-10-03 15:32:59 +0200 |
---|---|---|
committer | Nicholas Bellinger <nab@linux-iscsi.org> | 2015-10-13 22:17:57 -0700 |
commit | 517982229f78b2aebf00a8a337e84e8eeea70b8e (patch) | |
tree | 6f5f093837a26d5b56874689234dc818951779ac /samples/configfs/configfs_sample.c | |
parent | ocfs2/cluster: use per-attribute show and store methods (diff) | |
download | wireguard-linux-517982229f78b2aebf00a8a337e84e8eeea70b8e.tar.xz wireguard-linux-517982229f78b2aebf00a8a337e84e8eeea70b8e.zip |
configfs: remove old API
Remove the old show_attribute and store_attribute methods and update
the documentation. Also replace the two C samples with a single new
one in the proper samples directory where people expect to find it.
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
Diffstat (limited to '')
-rw-r--r-- | samples/configfs/configfs_sample.c (renamed from Documentation/filesystems/configfs/configfs_example_macros.c) | 140 |
1 files changed, 49 insertions, 91 deletions
diff --git a/Documentation/filesystems/configfs/configfs_example_macros.c b/samples/configfs/configfs_sample.c index 327dfbc640a9..1ea33119e532 100644 --- a/Documentation/filesystems/configfs/configfs_example_macros.c +++ b/samples/configfs/configfs_sample.c @@ -54,18 +54,13 @@ struct childless { static inline struct childless *to_childless(struct config_item *item) { - return item ? container_of(to_configfs_subsystem(to_config_group(item)), struct childless, subsys) : NULL; + return item ? container_of(to_configfs_subsystem(to_config_group(item)), + struct childless, subsys) : NULL; } -CONFIGFS_ATTR_STRUCT(childless); -#define CHILDLESS_ATTR(_name, _mode, _show, _store) \ -struct childless_attribute childless_attr_##_name = __CONFIGFS_ATTR(_name, _mode, _show, _store) -#define CHILDLESS_ATTR_RO(_name, _show) \ -struct childless_attribute childless_attr_##_name = __CONFIGFS_ATTR_RO(_name, _show); - -static ssize_t childless_showme_read(struct childless *childless, - char *page) +static ssize_t childless_showme_show(struct config_item *item, char *page) { + struct childless *childless = to_childless(item); ssize_t pos; pos = sprintf(page, "%d\n", childless->showme); @@ -74,16 +69,15 @@ static ssize_t childless_showme_read(struct childless *childless, return pos; } -static ssize_t childless_storeme_read(struct childless *childless, - char *page) +static ssize_t childless_storeme_show(struct config_item *item, char *page) { - return sprintf(page, "%d\n", childless->storeme); + return sprintf(page, "%d\n", to_childless(item)->storeme); } -static ssize_t childless_storeme_write(struct childless *childless, - const char *page, - size_t count) +static ssize_t childless_storeme_store(struct config_item *item, + const char *page, size_t count) { + struct childless *childless = to_childless(item); unsigned long tmp; char *p = (char *) page; @@ -99,8 +93,7 @@ static ssize_t childless_storeme_write(struct childless *childless, return count; } -static ssize_t childless_description_read(struct childless *childless, - char *page) +static ssize_t childless_description_show(struct config_item *item, char *page) { return sprintf(page, "[01-childless]\n" @@ -111,26 +104,18 @@ static ssize_t childless_description_read(struct childless *childless, "than a directory in /proc.\n"); } -CHILDLESS_ATTR_RO(showme, childless_showme_read); -CHILDLESS_ATTR(storeme, S_IRUGO | S_IWUSR, childless_storeme_read, - childless_storeme_write); -CHILDLESS_ATTR_RO(description, childless_description_read); +CONFIGFS_ATTR_RO(childless_, showme); +CONFIGFS_ATTR(childless_, storeme); +CONFIGFS_ATTR_RO(childless_, description); static struct configfs_attribute *childless_attrs[] = { - &childless_attr_showme.attr, - &childless_attr_storeme.attr, - &childless_attr_description.attr, + &childless_attr_showme, + &childless_attr_storeme, + &childless_attr_description, NULL, }; -CONFIGFS_ATTR_OPS(childless); -static struct configfs_item_operations childless_item_ops = { - .show_attribute = childless_attr_show, - .store_attribute = childless_attr_store, -}; - static struct config_item_type childless_type = { - .ct_item_ops = &childless_item_ops, .ct_attrs = childless_attrs, .ct_owner = THIS_MODULE, }; @@ -168,32 +153,13 @@ static inline struct simple_child *to_simple_child(struct config_item *item) return item ? container_of(item, struct simple_child, item) : NULL; } -static struct configfs_attribute simple_child_attr_storeme = { - .ca_owner = THIS_MODULE, - .ca_name = "storeme", - .ca_mode = S_IRUGO | S_IWUSR, -}; - -static struct configfs_attribute *simple_child_attrs[] = { - &simple_child_attr_storeme, - NULL, -}; - -static ssize_t simple_child_attr_show(struct config_item *item, - struct configfs_attribute *attr, - char *page) +static ssize_t simple_child_storeme_show(struct config_item *item, char *page) { - ssize_t count; - struct simple_child *simple_child = to_simple_child(item); - - count = sprintf(page, "%d\n", simple_child->storeme); - - return count; + return sprintf(page, "%d\n", to_simple_child(item)->storeme); } -static ssize_t simple_child_attr_store(struct config_item *item, - struct configfs_attribute *attr, - const char *page, size_t count) +static ssize_t simple_child_storeme_store(struct config_item *item, + const char *page, size_t count) { struct simple_child *simple_child = to_simple_child(item); unsigned long tmp; @@ -211,6 +177,13 @@ static ssize_t simple_child_attr_store(struct config_item *item, return count; } +CONFIGFS_ATTR(simple_child_, storeme); + +static struct configfs_attribute *simple_child_attrs[] = { + &simple_child_attr_storeme, + NULL, +}; + static void simple_child_release(struct config_item *item) { kfree(to_simple_child(item)); @@ -218,8 +191,6 @@ static void simple_child_release(struct config_item *item) static struct configfs_item_operations simple_child_item_ops = { .release = simple_child_release, - .show_attribute = simple_child_attr_show, - .store_attribute = simple_child_attr_store, }; static struct config_item_type simple_child_type = { @@ -235,10 +206,12 @@ struct simple_children { static inline struct simple_children *to_simple_children(struct config_item *item) { - return item ? container_of(to_config_group(item), struct simple_children, group) : NULL; + return item ? container_of(to_config_group(item), + struct simple_children, group) : NULL; } -static struct config_item *simple_children_make_item(struct config_group *group, const char *name) +static struct config_item *simple_children_make_item(struct config_group *group, + const char *name) { struct simple_child *simple_child; @@ -254,20 +227,8 @@ static struct config_item *simple_children_make_item(struct config_group *group, return &simple_child->item; } -static struct configfs_attribute simple_children_attr_description = { - .ca_owner = THIS_MODULE, - .ca_name = "description", - .ca_mode = S_IRUGO, -}; - -static struct configfs_attribute *simple_children_attrs[] = { - &simple_children_attr_description, - NULL, -}; - -static ssize_t simple_children_attr_show(struct config_item *item, - struct configfs_attribute *attr, - char *page) +static ssize_t simple_children_description_show(struct config_item *item, + char *page) { return sprintf(page, "[02-simple-children]\n" @@ -276,6 +237,13 @@ static ssize_t simple_children_attr_show(struct config_item *item, "items have only one attribute that is readable and writeable.\n"); } +CONFIGFS_ATTR_RO(simple_children_, description); + +static struct configfs_attribute *simple_children_attrs[] = { + &simple_children_attr_description, + NULL, +}; + static void simple_children_release(struct config_item *item) { kfree(to_simple_children(item)); @@ -283,7 +251,6 @@ static void simple_children_release(struct config_item *item) static struct configfs_item_operations simple_children_item_ops = { .release = simple_children_release, - .show_attribute = simple_children_attr_show, }; /* @@ -323,7 +290,8 @@ static struct configfs_subsystem simple_children_subsys = { * children of its own. */ -static struct config_group *group_children_make_group(struct config_group *group, const char *name) +static struct config_group *group_children_make_group( + struct config_group *group, const char *name) { struct simple_children *simple_children; @@ -338,20 +306,8 @@ static struct config_group *group_children_make_group(struct config_group *group return &simple_children->group; } -static struct configfs_attribute group_children_attr_description = { - .ca_owner = THIS_MODULE, - .ca_name = "description", - .ca_mode = S_IRUGO, -}; - -static struct configfs_attribute *group_children_attrs[] = { - &group_children_attr_description, - NULL, -}; - -static ssize_t group_children_attr_show(struct config_item *item, - struct configfs_attribute *attr, - char *page) +static ssize_t group_children_description_show(struct config_item *item, + char *page) { return sprintf(page, "[03-group-children]\n" @@ -360,8 +316,11 @@ static ssize_t group_children_attr_show(struct config_item *item, "groups are like the subsystem simple-children.\n"); } -static struct configfs_item_operations group_children_item_ops = { - .show_attribute = group_children_attr_show, +CONFIGFS_ATTR_RO(group_children_, description); + +static struct configfs_attribute *group_children_attrs[] = { + &group_children_attr_description, + NULL, }; /* @@ -373,7 +332,6 @@ static struct configfs_group_operations group_children_group_ops = { }; static struct config_item_type group_children_type = { - .ct_item_ops = &group_children_item_ops, .ct_group_ops = &group_children_group_ops, .ct_attrs = group_children_attrs, .ct_owner = THIS_MODULE, |