From: Simon Wunderlich simon@open-mesh.com
Currently, the post function is also called on errors or if there were no changes, which is redundant for the functions currently using these facilities.
Signed-off-by: Simon Wunderlich simon@open-mesh.com --- net/batman-adv/sysfs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/net/batman-adv/sysfs.c b/net/batman-adv/sysfs.c index 6d6df12..f38d7b7 100644 --- a/net/batman-adv/sysfs.c +++ b/net/batman-adv/sysfs.c @@ -243,10 +243,13 @@ ssize_t batadv_show_vlan_##_name(struct kobject *kobj, \
static int batadv_store_bool_attr(char *buff, size_t count, struct net_device *net_dev, - const char *attr_name, atomic_t *attr) + const char *attr_name, atomic_t *attr, + bool *changed) { int enabled = -1;
+ *changed = false; + if (buff[count - 1] == '\n') buff[count - 1] = '\0';
@@ -273,6 +276,8 @@ static int batadv_store_bool_attr(char *buff, size_t count, atomic_read(attr) == 1 ? "enabled" : "disabled", enabled == 1 ? "enabled" : "disabled");
+ *changed = true; + atomic_set(attr, (unsigned int)enabled); return count; } @@ -283,11 +288,12 @@ __batadv_store_bool_attr(char *buff, size_t count, struct attribute *attr, atomic_t *attr_store, struct net_device *net_dev) { + bool changed; int ret;
ret = batadv_store_bool_attr(buff, count, net_dev, attr->name, - attr_store); - if (post_func && ret) + attr_store, &changed); + if (post_func && changed) post_func(net_dev);
return ret;
On Tuesday, November 17, 2015 14:11:26 Simon Wunderlich wrote:
From: Simon Wunderlich simon@open-mesh.com
Currently, the post function is also called on errors or if there were no changes, which is redundant for the functions currently using these facilities.
Signed-off-by: Simon Wunderlich simon@open-mesh.com
net/batman-adv/sysfs.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
Applied in revision 743df46.
Thanks, Marek
b.a.t.m.a.n@lists.open-mesh.org