The following commit has been merged in the linux branch: commit a6a8357788d6a37f8ad0f7eb46b0a386b613abb9 Author: Cornelia Huck cornelia.huck@de.ibm.com Date: Tue Oct 6 15:33:35 2009 +0200
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
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 0050fc4..5fad489 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -894,7 +894,8 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj)
mutex_lock(&sysfs_rename_mutex); 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; if (sd->s_parent == new_parent_sd)