diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2009-10-06 15:33:35 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-10-14 15:16:25 -0700 |
| commit | a6a8357788d6a37f8ad0f7eb46b0a386b613abb9 (patch) | |
| tree | b8505a5394bc7f825753e0451f421b8333388e37 | |
| parent | 80f506918fdaaca6b574ba931536a58ce015c7be (diff) | |
| download | linux-3.10-a6a8357788d6a37f8ad0f7eb46b0a386b613abb9.tar.gz linux-3.10-a6a8357788d6a37f8ad0f7eb46b0a386b613abb9.tar.bz2 linux-3.10-a6a8357788d6a37f8ad0f7eb46b0a386b613abb9.zip | |
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>
| -rw-r--r-- | fs/sysfs/dir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 0050fc40e8c..5fad489ce5b 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) |