3 files changed, 9 insertions, 4 deletions

diff --git a/arch/s390/include/asm/ccwgroup.h b/arch/s390/include/asm/ccwgroup.h
index 6e670f88d125..ebc2913f9ee0 100644
--- a/arch/s390/include/asm/ccwgroup.h
+++ b/arch/s390/include/asm/ccwgroup.h
@@ -22,8 +22,8 @@ struct ccwgroup_device {
 /* public: */
         unsigned int count;
         struct device   dev;
-        struct ccw_device *cdev[0];
         struct work_struct ungroup_work;
+        struct ccw_device *cdev[0];
 };
 
 /**
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c
index 78f3403300af..ac127cd008bf 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;
 }
 
diff --git a/fs/kernfs/file.c b/fs/kernfs/file.c
index 8034706a7af8..e01ea4a14a01 100644
--- a/fs/kernfs/file.c
+++ b/fs/kernfs/file.c
@@ -484,6 +484,8 @@ static int kernfs_fop_mmap(struct file *file, struct vm_area_struct *vma)
 
         ops = kernfs_ops(of->kn);
         rc = ops->mmap(of, vma);
+        if (rc)
+                goto out_put;
 
         /*
          * PowerPC's pci_mmap of legacy_mem uses shmem_zero_setup()