Commit a6a83577 authored Oct 06, 2009 by Cornelia Huck Committed by Greg Kroah-Hartman Oct 14, 2009

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>

parent 80f50691

fs/sysfs/dir.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)