You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
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."
This commit is contained in:
@@ -585,9 +585,8 @@ static struct config_item_type netconsole_target_type = {
|
||||
* Group operations and type for netconsole_subsys.
|
||||
*/
|
||||
|
||||
static int make_netconsole_target(struct config_group *group,
|
||||
const char *name,
|
||||
struct config_item **new_item)
|
||||
static struct config_item *make_netconsole_target(struct config_group *group,
|
||||
const char *name)
|
||||
{
|
||||
unsigned long flags;
|
||||
struct netconsole_target *nt;
|
||||
@@ -599,7 +598,7 @@ static int make_netconsole_target(struct config_group *group,
|
||||
nt = kzalloc(sizeof(*nt), GFP_KERNEL);
|
||||
if (!nt) {
|
||||
printk(KERN_ERR "netconsole: failed to allocate memory\n");
|
||||
return -ENOMEM;
|
||||
return ERR_PTR(-ENOMEM);
|
||||
}
|
||||
|
||||
nt->np.name = "netconsole";
|
||||
@@ -616,8 +615,7 @@ static int make_netconsole_target(struct config_group *group,
|
||||
list_add(&nt->list, &target_list);
|
||||
spin_unlock_irqrestore(&target_list_lock, flags);
|
||||
|
||||
*new_item = &nt->item;
|
||||
return 0;
|
||||
return &nt->item;
|
||||
}
|
||||
|
||||
static void drop_netconsole_target(struct config_group *group,
|
||||
|
||||
Reference in New Issue
Block a user