From 420ff55669f6613d5320934429f1654ecad9b9b9 Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Thu, 14 Jun 2007 03:45:17 +0900 Subject: [PATCH] --- yaml --- r: 59131 b: refs/heads/master c: 7f7cfffe60ed6271c4028ec79ae1c297b44bcb14 h: refs/heads/master i: 59129: f55ada1bf2131ff52f3bde50392a9690aead81fd 59127: 0fdd91bd9e71d9b0678fe1a83cbe6cba6509ced5 v: v3 --- [refs] | 2 +- trunk/fs/sysfs/dir.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 4095f60e710e..f844d78a186f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 42b37df6abb42ae021e15bf865b43f3629c7f3ab +refs/heads/master: 7f7cfffe60ed6271c4028ec79ae1c297b44bcb14 diff --git a/trunk/fs/sysfs/dir.c b/trunk/fs/sysfs/dir.c index a63d12e4be56..a26e3db89432 100644 --- a/trunk/fs/sysfs/dir.c +++ b/trunk/fs/sysfs/dir.c @@ -497,6 +497,9 @@ int sysfs_rename_dir(struct kobject * kobj, struct dentry *new_parent, d_move(kobj->dentry, new_dentry); list_del_init(&sd->s_sibling); + sysfs_get(parent_sd); + sysfs_put(sd->s_parent); + sd->s_parent = parent_sd; list_add(&sd->s_sibling, &parent_sd->s_children); error = 0; @@ -550,6 +553,9 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent) /* Remove from old parent's list and insert into new parent's list. */ list_del_init(&sd->s_sibling); + sysfs_get(new_parent_sd); + sysfs_put(sd->s_parent); + sd->s_parent = new_parent_sd; list_add(&sd->s_sibling, &new_parent_sd->s_children); out: