Merge 3.15-rc3 into staging-next

1 files changed, 6 insertions, 3 deletions

diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 43aa97988c31..a693f5b01ae6 100644
--- a/fs/kernfs/dir.c
+++ b/fs/kernfs/dir.c
@@ -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;
 }