[PATCH] Allow sysfs_remove_group() to be called on non-added groups

Subsystems: driver core, kobjects, debugfs and sysfs, filesystems (vfs and infrastructure), the rest

STALE6903d

4 messages, 2 authors, 2007-10-23 · open the first message on its own page

[PATCH] Allow sysfs_remove_group() to be called on non-added groups

From: Michael Ellerman <hidden>
Date: 2007-09-13 04:25:48 

It would be nice to be able to do:

for_each_thing(thing) {
 	error = sysfs_create_group(&thing->kobj, attrs);
 	if (error) {
 		for_each_thing(thing)
 			sysfs_remove_group(&thing->kobj, attrs);
		return error;
	}
}

But there's a BUG_ON() in sysfs_remove_group() which hits if the attributes
were never added.

As discussed here ...
http://ozlabs.org/pipermail/cbe-oss-dev/2007-July/002774.html

.. we should just return in that case instead of BUG'ing.

Signed-off-by: Michael Ellerman <redacted>
---
 fs/sysfs/group.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index f318b73..a256775 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -73,7 +73,8 @@ void sysfs_remove_group(struct kobject * kobj,
 
 	if (grp->name) {
 		sd = sysfs_get_dirent(dir_sd, grp->name);
-		BUG_ON(!sd);
+		if (!sd)
+			return;
 	} else
 		sd = sysfs_get(dir_sd);
 
-- 
1.5.1.3.g7a33b

Re: [PATCH] Allow sysfs_remove_group() to be called on non-added groups

From: Michael Ellerman <hidden>
Date: 2007-10-23 02:02:54 

On 9/13/07, Michael Ellerman [off-list ref] wrote:
quoted hunk
It would be nice to be able to do:

for_each_thing(thing) {
        error = sysfs_create_group(&thing->kobj, attrs);
        if (error) {
                for_each_thing(thing)
                        sysfs_remove_group(&thing->kobj, attrs);
                return error;
        }
}

But there's a BUG_ON() in sysfs_remove_group() which hits if the attributes
were never added.

As discussed here ...
http://ozlabs.org/pipermail/cbe-oss-dev/2007-July/002774.html

.. we should just return in that case instead of BUG'ing.

Signed-off-by: Michael Ellerman <redacted>
---
 fs/sysfs/group.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index f318b73..a256775 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -73,7 +73,8 @@ void sysfs_remove_group(struct kobject * kobj,

        if (grp->name) {
                sd = sysfs_get_dirent(dir_sd, grp->name);
-               BUG_ON(!sd);
+               if (!sd)
+                       return;
        } else
                sd = sysfs_get(dir_sd);

Hi Greg,

I didn't see this in your series, any objections? AFAICT it still applies.

cheers

Re: [PATCH] Allow sysfs_remove_group() to be called on non-added groups

From: Greg KH <hidden>
Date: 2007-10-23 03:24:19 

On Tue, Oct 23, 2007 at 12:02:39PM +1000, Michael Ellerman wrote:
On 9/13/07, Michael Ellerman [off-list ref] wrote:
quoted
It would be nice to be able to do:

for_each_thing(thing) {
        error = sysfs_create_group(&thing->kobj, attrs);
        if (error) {
                for_each_thing(thing)
                        sysfs_remove_group(&thing->kobj, attrs);
                return error;
        }
}

But there's a BUG_ON() in sysfs_remove_group() which hits if the attributes
were never added.

As discussed here ...
http://ozlabs.org/pipermail/cbe-oss-dev/2007-July/002774.html

.. we should just return in that case instead of BUG'ing.

Signed-off-by: Michael Ellerman <redacted>
---
 fs/sysfs/group.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index f318b73..a256775 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -73,7 +73,8 @@ void sysfs_remove_group(struct kobject * kobj,

        if (grp->name) {
                sd = sysfs_get_dirent(dir_sd, grp->name);
-               BUG_ON(!sd);
+               if (!sd)
+                       return;
        } else
                sd = sysfs_get(dir_sd);

Hi Greg,

I didn't see this in your series, any objections? AFAICT it still applies.
Hm, I think I just missed it, care to forward it to me "clean" again?

thanks,

greg k-h

[PATCH] Allow sysfs_remove_group() to be called on non-added groups

From: Michael Ellerman <hidden>
Date: 2007-10-23 04:18:25 

It would be nice to be able to do:

for_each_thing(thing) {
 	error = sysfs_create_group(&thing->kobj, attrs);
 	if (error) {
 		for_each_thing(thing)
 			sysfs_remove_group(&thing->kobj, attrs);
		return error;
	}
}

But there's a BUG_ON() in sysfs_remove_group() which hits if the attributes
were never added.

As discussed here ...
http://ozlabs.org/pipermail/cbe-oss-dev/2007-July/002774.html

.. we should just return in that case instead of BUG'ing.

Signed-off-by: Michael Ellerman <redacted>
---
 fs/sysfs/group.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c
index f318b73..a256775 100644
--- a/fs/sysfs/group.c
+++ b/fs/sysfs/group.c
@@ -73,7 +73,8 @@ void sysfs_remove_group(struct kobject * kobj,
 
 	if (grp->name) {
 		sd = sysfs_get_dirent(dir_sd, grp->name);
-		BUG_ON(!sd);
+		if (!sd)
+			return;
 	} else
 		sd = sysfs_get(dir_sd);
 
-- 
1.5.1.3.g7a33b
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help