On Fri, 18 Dec 2015, Vitaly Kuznetsov wrote:
> diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c
> index 67d488a..9392f01 100644
> --- a/mm/memory_hotplug.c
> +++ b/mm/memory_hotplug.c
> @@ -127,11 +127,13 @@ void mem_hotplug_done(void)
> }
>
> /* add this memory to iomem resource */
> -static struct resource *register_memory_resource(u64 start, u64 size)
> +static int register_memory_resource(u64 start, u64 size,
> + struct resource **resource)
> {
> struct resource *res;
> res = kzalloc(sizeof(struct resource), GFP_KERNEL);
> - BUG_ON(!res);
> + if (!res)
> + return -ENOMEM;
>
> res->name = "System RAM";
> res->start = start;
> @@ -140,9 +142,10 @@ static struct resource *register_memory_resource(u64
> start, u64 size)
> if (request_resource(&iomem_resource, res) < 0) {
> pr_debug("System RAM resource %pR cannot be added\n", res);
> kfree(res);
> - res = NULL;
> + return -EEXIST;
> }
> - return res;
> + *resource = res;
> + return 0;
> }
>
> static void release_memory_resource(struct resource *res)
> @@ -1311,9 +1314,9 @@ int __ref add_memory(int nid, u64 start, u64 size)
> struct resource *res;
> int ret;
>
> - res = register_memory_resource(start, size);
> - if (!res)
> - return -EEXIST;
> + ret = register_memory_resource(start, size, &res);
> + if (ret)
> + return ret;
>
> ret = add_memory_resource(nid, res);
> if (ret < 0)
Wouldn't it be simpler and cleaner to keep the return type of
register_memory_resource() the same and return ERR_PTR(-ENOMEM) or
ERR_PTR(-EEXIST) on error? add_memory() can check IS_ERR(res) and return
PTR_ERR(res).
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
