diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 02:17:52 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-21 02:17:52 +0200 |
commit | f7df406dce01dfd30d7e0c570a928bcfeff03142 (patch) | |
tree | 6befad5177581f2f136b22117670f00019c7ea0f /Documentation/filesystems/configfs/configfs.txt | |
parent | APCI: revert another duplicated patch (diff) | |
parent | configfs: Allow ->make_item() and ->make_group() to return detailed errors. (diff) | |
download | linux-f7df406dce01dfd30d7e0c570a928bcfeff03142.tar.xz linux-f7df406dce01dfd30d7e0c570a928bcfeff03142.zip |
Merge branch 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6
* 'configfs-fixup-ptr-error' of git://oss.oracle.com/git/jlbec/linux-2.6:
configfs: Allow ->make_item() and ->make_group() to return detailed errors.
Revert "configfs: Allow ->make_item() and ->make_group() to return detailed errors."
Diffstat (limited to 'Documentation/filesystems/configfs/configfs.txt')
-rw-r--r-- | Documentation/filesystems/configfs/configfs.txt | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/filesystems/configfs/configfs.txt b/Documentation/filesystems/configfs/configfs.txt index 15838d706ea2..44c97e6accb2 100644 --- a/Documentation/filesystems/configfs/configfs.txt +++ b/Documentation/filesystems/configfs/configfs.txt @@ -233,12 +233,10 @@ accomplished via the group operations specified on the group's config_item_type. 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); |