diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-30 13:38:04 -0400 |
| commit | 2e6713c7662cc5ebc7346b033c404cb2f708fd51 (patch) | |
| tree | 8492ea548fea2d8243e4af4b877906afc4e32783 /fs/sysfs/dir.c | |
| parent | b4093d6235b7e4249616651ee328600ced48a18a (diff) | |
| parent | 658874f05d040ca96eb5ba9b1c30ce0ff287d762 (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'fs/sysfs/dir.c')
| -rw-r--r-- | fs/sysfs/dir.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index d88d0fac9fa5..14f2d71ea3ce 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c | |||
| @@ -939,8 +939,10 @@ again: | |||
| 939 | /* Remove from old parent's list and insert into new parent's list. */ | 939 | /* Remove from old parent's list and insert into new parent's list. */ |
| 940 | sysfs_unlink_sibling(sd); | 940 | sysfs_unlink_sibling(sd); |
| 941 | sysfs_get(new_parent_sd); | 941 | sysfs_get(new_parent_sd); |
| 942 | drop_nlink(old_parent->d_inode); | ||
| 942 | sysfs_put(sd->s_parent); | 943 | sysfs_put(sd->s_parent); |
| 943 | sd->s_parent = new_parent_sd; | 944 | sd->s_parent = new_parent_sd; |
| 945 | inc_nlink(new_parent->d_inode); | ||
| 944 | sysfs_link_sibling(sd); | 946 | sysfs_link_sibling(sd); |
| 945 | 947 | ||
| 946 | out_unlock: | 948 | out_unlock: |