Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[safe/jmp/linux-2.6] / include / linux / configfs.h

diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index 0488f93..d62c19f 100644 (file)
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -148,7 +148,8 @@ struct configfs_attribute {
  * items.  If the item is a group, it may support mkdir(2).
  * Groups supply one of make_group() and make_item().  If the
  * group supports make_group(), one can create group children.  If it
- * supports make_item(), one can create config_item children.  If it has
+ * supports make_item(), one can create config_item children.  make_group()
+ * and make_item() return ERR_PTR() on errors.  If it has
  * default_groups on group->default_groups, it has automatically created
  * group children.  default_groups may coexist alongsize make_group() or
  * make_item(), but if the group wishes to have only default_groups
@@ -165,8 +166,8 @@ struct configfs_item_operations {
 };
 
 struct configfs_group_operations {
-       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);
+       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 (*commit_item)(struct config_item *item);
        void (*disconnect_notify)(struct config_group *group, struct config_item *item);
        void (*drop_item)(struct config_group *group, struct config_item *item);