sugar/linux
1
0
Fork 0
Code Activity

Merge 3.15-rc3 into staging-next

Browse Source
This commit is contained in:
Greg Kroah-Hartman
2014-04-27 21:36:39 -07:00
parent 86d56134f1 d1db0eea85
commit d35cc56ddf
249 changed files with 2319 additions and 1448 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fs/kernfs/dir.c
View File

@@ -232,9 +232,6 @@ static int kernfs_link_sibling(struct kernfs_node *kn)
struct rb_node **node = &kn->parent->dir.children.rb_node;
struct rb_node *parent = NULL;
if (kernfs_type(kn) == KERNFS_DIR)
kn->parent->dir.subdirs++;
while (*node) {
struct kernfs_node *pos;
int result;
@@ -249,9 +246,15 @@ static int kernfs_link_sibling(struct kernfs_node *kn)
else
return -EEXIST;
}
/* add new node and rebalance the tree */
rb_link_node(&kn->rb, parent, node);
rb_insert_color(&kn->rb, &kn->parent->dir.children);
/* successfully added, account subdir number */
if (kernfs_type(kn) == KERNFS_DIR)
kn->parent->dir.subdirs++;
return 0;
}