Merge branch 'linus' into x86/paravirt-spinlocks

[linux-block.git] / include / linux / configfs.h

diff --git a/include/linux/configfs.h b/include/linux/configfs.h
index 3ae65b1bf90fd891b32538390c103f12632560fd..0488f937634a274a5f55291da889071dba635d07 100644 (file)
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
@@ -165,8 +165,8 @@ struct configfs_item_operations {
 };
 
 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);
        void (*drop_item)(struct config_group *group, struct config_item *item);