Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  [PATCH] ocfs2: fix oops in mmap_truncate testing
  configfs: call drop_link() to cleanup after create_link() failure
  configfs: Allow ->make_item() and ->make_group() to return detailed errors.
  configfs: Fix failing mkdir() making racing rmdir() fail
  configfs: Fix deadlock with racing rmdir() and rename()
  configfs: Make configfs_new_dirent() return error code instead of NULL
  configfs: Protect configfs_dirent s_links list mutations
  configfs: Introduce configfs_dirent_lock
  ocfs2: Don't snprintf() without a format.
  ocfs2: Fix CONFIG_OCFS2_DEBUG_FS #ifdefs
  ocfs2/net: Silence build warnings on sparc64
  ocfs2: Handle error during journal load
  ocfs2: Silence an error message in ocfs2_file_aio_read()
  ocfs2: use simple_read_from_buffer()
  ocfs2: fix printk format warnings with OCFS2_FS_STATS=n
  [PATCH 2/2] ocfs2: Instrument fs cluster locks
  [PATCH 1/2] ocfs2: Add CONFIG_OCFS2_FS_STATS config option

2 files changed, 14 insertions, 10 deletions

diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt
index 44c97e6accb2..15838d706ea2 100644
--- a/Documentation/filesystems/configfs/configfs.txt
+++ b/Documentation/filesystems/configfs/configfs.txt
@@ -233,10 +233,12 @@ accomplished via the group operations specified on the group's
 config_item_type.
 
         struct configfs_group_operations {
-                struct config_item *(*make_item)(struct config_group *group,
-                                                 const char *name);
-                struct config_group *(*make_group)(struct config_group *group,
-                                                   const char *name);
+                int (*make_item)(struct config_group *group,
+                                 const char *name,
+                                 struct config_item **new_item);
+                int (*make_group)(struct config_group *group,
+                                  const char *name,
+                                  struct config_group **new_group);
                 int (*commit_item)(struct config_item *item);
                 void (*disconnect_notify)(struct config_group *group,
                                           struct config_item *item);
diff --git a/Documentation/filesystems/configfs/configfs_example.c b/Documentation/filesystems/configfs/configfs_example.c
index 25151fd5c2c6..0b422acd470c 100644
--- a/Documentation/filesystems/configfs/configfs_example.c
+++ b/Documentation/filesystems/configfs/configfs_example.c
@@ -273,13 +273,13 @@ static inline struct simple_children *to_simple_children(struct config_item *ite
         return item ? container_of(to_config_group(item), struct simple_children, group) : NULL;
 }
 
-static struct config_item *simple_children_make_item(struct config_group *group, const char *name)
+static int simple_children_make_item(struct config_group *group, const char *name, struct config_item **new_item)
 {
         struct simple_child *simple_child;
 
         simple_child = kzalloc(sizeof(struct simple_child), GFP_KERNEL);
         if (!simple_child)
-                return NULL;
+                return -ENOMEM;
 
 
         config_item_init_type_name(&simple_child->item, name,
@@ -287,7 +287,8 @@ static struct config_item *simple_children_make_item(struct config_group *group,
 
         simple_child->storeme = 0;
 
-        return &simple_child->item;
+        *new_item = &simple_child->item;
+        return 0;
 }
 
 static struct configfs_attribute simple_children_attr_description = {
@@ -359,20 +360,21 @@ static struct configfs_subsystem simple_children_subsys = {
  * children of its own.
  */
 
-static struct config_group *group_children_make_group(struct config_group *group, const char *name)
+static int group_children_make_group(struct config_group *group, const char *name, struct config_group **new_group)
 {
         struct simple_children *simple_children;
 
         simple_children = kzalloc(sizeof(struct simple_children),
                                   GFP_KERNEL);
         if (!simple_children)
-                return NULL;
+                return -ENOMEM;
 
 
         config_group_init_type_name(&simple_children->group, name,
                                     &simple_children_type);
 
-        return &simple_children->group;
+        *new_group = &simple_children->group;
+        return 0;
 }
 
 static struct configfs_attribute group_children_attr_description = {