gh0s7/mckernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysfs: attempt to remove empty directories only

Browse Source
This commit is contained in:
NAKAMURA Gou
2016-01-26 14:47:00 +09:00
parent a6cb9a6b93
commit 2e98f875c3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
executer/kernel/mcctrl/sysfs.c
View File

@@ -687,9 +687,8 @@ unlink_i(struct sysfsm_node *np)
} }
if ((np->type == SNT_DIR) && !list_empty(&np->children)) { if ((np->type == SNT_DIR) && !list_empty(&np->children)) {
/* this is usual when called from cleanup_ancestor() */
error = -ENOTEMPTY; error = -ENOTEMPTY;
dprintk("mcctrl:unlink_i:not empty dir. %d\n", error); eprintk("mcctrl:unlink_i:not empty dir. %d\n", error);
goto out; goto out;
} }
@@ -875,6 +874,13 @@ cleanup_ancestor(struct sysfsm_node *target)
error = 0; error = 0;
for (np = target; !error; np = next_np) { for (np = target; !error; np = next_np) {
next_np = np->parent; next_np = np->parent;
if ((np == np->sdp->sysfs_root)
|| (np->parent == np->sdp->sysfs_root)
|| !list_empty(&np->children)) {
break;
}
error = unlink_i(np); error = unlink_i(np);
} }