sysfs: Allow sysfs_move_dir(..., NULL) again.
As device_move() and kobject_move() both handle a NULL destination, sysfs_move_dir() should do this as well (again) and fall back to sysfs_root in that case. Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> Cc: Phil Carmody <ext-phil.2.carmody@nokia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
80f506918f
commit
a6a8357788
|
@ -894,7 +894,8 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)
|
||||||
|
|
||||||
mutex_lock(&sysfs_rename_mutex);
|
mutex_lock(&sysfs_rename_mutex);
|
||||||
BUG_ON(!sd->s_parent);
|
BUG_ON(!sd->s_parent);
|
||||||
new_parent_sd = new_parent_kobj->sd ? new_parent_kobj->sd : &sysfs_root;
|
new_parent_sd = (new_parent_kobj && new_parent_kobj->sd) ?
|
||||||
|
new_parent_kobj->sd : &sysfs_root;
|
||||||
|
|
||||||
error = 0;
|
error = 0;
|
||||||
if (sd->s_parent == new_parent_sd)
|
if (sd->s_parent == new_parent_sd)
|
||||||
|
|
Loading…
Reference in New Issue