diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-09-04 08:44:16 -0400 |
| commit | 695a461296e5df148c99ac087b9e1cb380f4db15 (patch) | |
| tree | 951893036fdc0b7bae0e17bc739ac8ffe909781d /fs/sysfs | |
| parent | c7084b35eb1a4d3353a501508baf9d3d82822c93 (diff) | |
| parent | 2b681fafcc50fea6304ed418667c9d04282acb73 (diff) | |
Merge branch 'amd-iommu/2.6.32' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu into core/iommu
Diffstat (limited to 'fs/sysfs')
| -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: |