sysfs: fix hardlink count on device_move
authorPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Tue, 14 Jul 2009 15:56:15 +0000 (17:56 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 28 Jul 2009 20:45:21 +0000 (13:45 -0700)
Update directory hardlink count when moving kobjects to a new parent.
Fixes the following problem which occurs when several devices are
moved to the same parent and then unregistered:

> ls -laF /sys/devices/css0/defunct/
> total 0
> drwxr-xr-x 4294967295 root root    0 2009-07-14 17:02 ./
> drwxr-xr-x        114 root root    0 2009-07-14 17:02 ../
> drwxr-xr-x          2 root root    0 2009-07-14 17:01 power/
> -rw-r--r--          1 root root 4096 2009-07-14 17:01 uevent

Signed-off-by: Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
fs/sysfs/dir.c

index d88d0fac9fa5f185afd13b1f36b11f58baec672d..14f2d71ea3ce8b7077b0da8774bc554b912cd0fb 100644 (file)
@@ -939,8 +939,10 @@ again:
        /* Remove from old parent's list and insert into new parent's list. */
        sysfs_unlink_sibling(sd);
        sysfs_get(new_parent_sd);
+       drop_nlink(old_parent->d_inode);
        sysfs_put(sd->s_parent);
        sd->s_parent = new_parent_sd;
+       inc_nlink(new_parent->d_inode);
        sysfs_link_sibling(sd);
 
  out_unlock: