diff mbox

[PATCHv2] Return correct error result if pool shm cannot be allocated

Message ID 1418727588-16841-1-git-send-email-bill.fischofer@linaro.org
State Accepted
Commit 57408e45ba64d287d402da8bd212edc9aa56d1ba
Headers show

Commit Message

Bill Fischofer Dec. 16, 2014, 10:59 a.m. UTC
Fix to Bug #1002

Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
---
v2 corrects commit message

 platform/linux-generic/odp_buffer_pool.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Maxim Uvarov Dec. 16, 2014, 3:13 p.m. UTC | #1
Took this to queue will be merged.

Maxim.

On 12/16/2014 01:59 PM, Bill Fischofer wrote:
> Fix to Bug #1002
>
> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
> ---
> v2 corrects commit message
>
>   platform/linux-generic/odp_buffer_pool.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c
> index e947dde..4c8b037 100644
> --- a/platform/linux-generic/odp_buffer_pool.c
> +++ b/platform/linux-generic/odp_buffer_pool.c
> @@ -234,7 +234,7 @@ odp_buffer_pool_t odp_buffer_pool_create(const char *name,
>   					      ODP_PAGE_SIZE, 0);
>   			if (shm == ODP_SHM_INVALID) {
>   				POOL_UNLOCK(&pool->s.lock);
> -				return ODP_BUFFER_INVALID;
> +				return ODP_BUFFER_POOL_INVALID;
>   			}
>   			pool->s.pool_base_addr = odp_shm_addr(shm);
>   		} else {
Mike Holmes Dec. 16, 2014, 3:34 p.m. UTC | #2
nit: commit message does not follow the pattern of "component: file/fn:
description"

linux-generic: odp_buffer_pool_create:  fix return type

change ODP_BUFFER_INVALID to ODP_BUFFER_POOL_INVALID
address bug #1002

Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
---



On 16 December 2014 at 10:13, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:
>
> Took this to queue will be merged.


Does it have reviewed-by assume you are adding yours ?


>
>
> Maxim.
>
> On 12/16/2014 01:59 PM, Bill Fischofer wrote:
>
>> Fix to Bug #1002
>>
>
1002 is "Resolved fixed" already but this is not merged yet - confused how
that can be :)


>> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
>> ---
>> v2 corrects commit message
>>
>>   platform/linux-generic/odp_buffer_pool.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/platform/linux-generic/odp_buffer_pool.c
>> b/platform/linux-generic/odp_buffer_pool.c
>> index e947dde..4c8b037 100644
>> --- a/platform/linux-generic/odp_buffer_pool.c
>> +++ b/platform/linux-generic/odp_buffer_pool.c
>> @@ -234,7 +234,7 @@ odp_buffer_pool_t odp_buffer_pool_create(const char
>> *name,
>>                                               ODP_PAGE_SIZE, 0);
>>                         if (shm == ODP_SHM_INVALID) {
>>                                 POOL_UNLOCK(&pool->s.lock);
>> -                               return ODP_BUFFER_INVALID;
>> +                               return ODP_BUFFER_POOL_INVALID;
>>                         }
>>                         pool->s.pool_base_addr = odp_shm_addr(shm);
>>                 } else {
>>
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
>
Bill Fischofer Dec. 16, 2014, 3:36 p.m. UTC | #3
I marked it fixed because a patch was posted.  I did not anticipate that
there would be any delay in getting it merged.

On Tue, Dec 16, 2014 at 9:34 AM, Mike Holmes <mike.holmes@linaro.org> wrote:
>
>
> nit: commit message does not follow the pattern of "component: file/fn:
> description"
>
> linux-generic: odp_buffer_pool_create:  fix return type
>
> change ODP_BUFFER_INVALID to ODP_BUFFER_POOL_INVALID
> address bug #1002
>
> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
> ---
>
>
>
> On 16 December 2014 at 10:13, Maxim Uvarov <maxim.uvarov@linaro.org>
> wrote:
>>
>> Took this to queue will be merged.
>
>
> Does it have reviewed-by assume you are adding yours ?
>
>
>>
>>
>> Maxim.
>>
>> On 12/16/2014 01:59 PM, Bill Fischofer wrote:
>>
>>> Fix to Bug #1002
>>>
>>
> 1002 is "Resolved fixed" already but this is not merged yet - confused how
> that can be :)
>
>
>>> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
>>> ---
>>> v2 corrects commit message
>>>
>>>   platform/linux-generic/odp_buffer_pool.c | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/platform/linux-generic/odp_buffer_pool.c
>>> b/platform/linux-generic/odp_buffer_pool.c
>>> index e947dde..4c8b037 100644
>>> --- a/platform/linux-generic/odp_buffer_pool.c
>>> +++ b/platform/linux-generic/odp_buffer_pool.c
>>> @@ -234,7 +234,7 @@ odp_buffer_pool_t odp_buffer_pool_create(const char
>>> *name,
>>>                                               ODP_PAGE_SIZE, 0);
>>>                         if (shm == ODP_SHM_INVALID) {
>>>                                 POOL_UNLOCK(&pool->s.lock);
>>> -                               return ODP_BUFFER_INVALID;
>>> +                               return ODP_BUFFER_POOL_INVALID;
>>>                         }
>>>                         pool->s.pool_base_addr = odp_shm_addr(shm);
>>>                 } else {
>>>
>>
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> http://lists.linaro.org/mailman/listinfo/lng-odp
>>
>
>
> --
> *Mike Holmes*
> Linaro  Sr Technical Manager
> LNG - ODP
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
>
>
Mike Holmes Dec. 16, 2014, 3:38 p.m. UTC | #4
On 16 December 2014 at 10:36, Bill Fischofer <bill.fischofer@linaro.org>
wrote:
>
> I marked it fixed because a patch was posted.  I did not anticipate that
> there would be any delay in getting it merged.
>

Ah ok, the problem is that the bugs then fall of the filters and if for
some reason it does not get in we wont follow up on it.



>
> On Tue, Dec 16, 2014 at 9:34 AM, Mike Holmes <mike.holmes@linaro.org>
> wrote:
>>
>>
>> nit: commit message does not follow the pattern of "component: file/fn:
>> description"
>>
>> linux-generic: odp_buffer_pool_create:  fix return type
>>
>> change ODP_BUFFER_INVALID to ODP_BUFFER_POOL_INVALID
>> address bug #1002
>>
>> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
>> ---
>>
>>
>>
>> On 16 December 2014 at 10:13, Maxim Uvarov <maxim.uvarov@linaro.org>
>> wrote:
>>>
>>> Took this to queue will be merged.
>>
>>
>> Does it have reviewed-by assume you are adding yours ?
>>
>>
>>>
>>>
>>> Maxim.
>>>
>>> On 12/16/2014 01:59 PM, Bill Fischofer wrote:
>>>
>>>> Fix to Bug #1002
>>>>
>>>
>> 1002 is "Resolved fixed" already but this is not merged yet - confused
>> how that can be :)
>>
>>
>>>> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
>>>> ---
>>>> v2 corrects commit message
>>>>
>>>>   platform/linux-generic/odp_buffer_pool.c | 2 +-
>>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>>
>>>> diff --git a/platform/linux-generic/odp_buffer_pool.c
>>>> b/platform/linux-generic/odp_buffer_pool.c
>>>> index e947dde..4c8b037 100644
>>>> --- a/platform/linux-generic/odp_buffer_pool.c
>>>> +++ b/platform/linux-generic/odp_buffer_pool.c
>>>> @@ -234,7 +234,7 @@ odp_buffer_pool_t odp_buffer_pool_create(const char
>>>> *name,
>>>>                                               ODP_PAGE_SIZE, 0);
>>>>                         if (shm == ODP_SHM_INVALID) {
>>>>                                 POOL_UNLOCK(&pool->s.lock);
>>>> -                               return ODP_BUFFER_INVALID;
>>>> +                               return ODP_BUFFER_POOL_INVALID;
>>>>                         }
>>>>                         pool->s.pool_base_addr = odp_shm_addr(shm);
>>>>                 } else {
>>>>
>>>
>>>
>>> _______________________________________________
>>> lng-odp mailing list
>>> lng-odp@lists.linaro.org
>>> http://lists.linaro.org/mailman/listinfo/lng-odp
>>>
>>
>>
>> --
>> *Mike Holmes*
>> Linaro  Sr Technical Manager
>> LNG - ODP
>>
>> _______________________________________________
>> lng-odp mailing list
>> lng-odp@lists.linaro.org
>> http://lists.linaro.org/mailman/listinfo/lng-odp
>>
>>
Maxim Uvarov Dec. 16, 2014, 3:39 p.m. UTC | #5
On 12/16/2014 06:34 PM, Mike Holmes wrote:
>
> nit: commit message does not follow the pattern of "component: 
> file/fn: description"
>
Pattern? Did we agree to use that pattern?  I reworded commit with text 
bellow. If needed I can reword
it one more time before push.


     linux-generic: fix return value in pool_create

     return correct error result if pool shm cannot be allocated
     Fix to Bug #1002

     Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
     Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

> linux-generic: odp_buffer_pool_create:  fix return type
>
> change ODP_BUFFER_INVALID to ODP_BUFFER_POOL_INVALID
> address bug #1002
>
> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org 
> <mailto:bill.fischofer@linaro.org>>
> ---
>
>
>
> On 16 December 2014 at 10:13, Maxim Uvarov <maxim.uvarov@linaro.org 
> <mailto:maxim.uvarov@linaro.org>> wrote:
>
>     Took this to queue will be merged.
>
>
> Does it have reviewed-by assume you are adding yours ?
>
>
>
>     Maxim.
>
>     On 12/16/2014 01:59 PM, Bill Fischofer wrote:
>
>         Fix to Bug #1002
>
>
> 1002 is "Resolved fixed" already but this is not merged yet - confused 
> how that can be :)
>
>
>         Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org
>         <mailto:bill.fischofer@linaro.org>>
>         ---
>         v2 corrects commit message
>
>           platform/linux-generic/odp_buffer_pool.c | 2 +-
>           1 file changed, 1 insertion(+), 1 deletion(-)
>
>         diff --git a/platform/linux-generic/odp_buffer_pool.c
>         b/platform/linux-generic/odp_buffer_pool.c
>         index e947dde..4c8b037 100644
>         --- a/platform/linux-generic/odp_buffer_pool.c
>         +++ b/platform/linux-generic/odp_buffer_pool.c
>         @@ -234,7 +234,7 @@ odp_buffer_pool_t
>         odp_buffer_pool_create(const char *name,
>         ODP_PAGE_SIZE, 0);
>                                 if (shm == ODP_SHM_INVALID) {
>         POOL_UNLOCK(&pool->s.lock);
>         -                               return ODP_BUFFER_INVALID;
>         +                               return ODP_BUFFER_POOL_INVALID;
>                                 }
>                                 pool->s.pool_base_addr =
>         odp_shm_addr(shm);
>                         } else {
>
>
>
>     _______________________________________________
>     lng-odp mailing list
>     lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org>
>     http://lists.linaro.org/mailman/listinfo/lng-odp
>
>
>
> -- 
> *Mike Holmes*
> Linaro  Sr Technical Manager
> LNG - ODP
Mike Holmes Dec. 16, 2014, 3:47 p.m. UTC | #6
On 16 December 2014 at 10:39, Maxim Uvarov <maxim.uvarov@linaro.org> wrote:
>
> On 12/16/2014 06:34 PM, Mike Holmes wrote:
>
>>
>> nit: commit message does not follow the pattern of "component: file/fn:
>> description"
>>
>>  Pattern? Did we agree to use that pattern?  I reworded commit with text
> bellow. If needed I can reword
> it one more time before push.
>

I was noticing that we have appeared to follow that pattern  recently and
it works well https://git.linaro.org/lng/odp.git
I know it is a small thing, but if you can fix the message that helps.


>
>
>     linux-generic: fix return value in pool_create
>
>     return correct error result if pool shm cannot be allocated
>     Fix to Bug #1002
>
>     Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org>
>     Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>
>
>  linux-generic: odp_buffer_pool_create:  fix return type
>>
>> change ODP_BUFFER_INVALID to ODP_BUFFER_POOL_INVALID
>> address bug #1002
>>
>> Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org <mailto:
>> bill.fischofer@linaro.org>>
>> ---
>>
>>
>>
>> On 16 December 2014 at 10:13, Maxim Uvarov <maxim.uvarov@linaro.org
>> <mailto:maxim.uvarov@linaro.org>> wrote:
>>
>>     Took this to queue will be merged.
>>
>>
>> Does it have reviewed-by assume you are adding yours ?
>>
>>
>>
>>     Maxim.
>>
>>     On 12/16/2014 01:59 PM, Bill Fischofer wrote:
>>
>>         Fix to Bug #1002
>>
>>
>> 1002 is "Resolved fixed" already but this is not merged yet - confused
>> how that can be :)
>>
>>
>>         Signed-off-by: Bill Fischofer <bill.fischofer@linaro.org
>>         <mailto:bill.fischofer@linaro.org>>
>>         ---
>>         v2 corrects commit message
>>
>>           platform/linux-generic/odp_buffer_pool.c | 2 +-
>>           1 file changed, 1 insertion(+), 1 deletion(-)
>>
>>         diff --git a/platform/linux-generic/odp_buffer_pool.c
>>         b/platform/linux-generic/odp_buffer_pool.c
>>         index e947dde..4c8b037 100644
>>         --- a/platform/linux-generic/odp_buffer_pool.c
>>         +++ b/platform/linux-generic/odp_buffer_pool.c
>>         @@ -234,7 +234,7 @@ odp_buffer_pool_t
>>         odp_buffer_pool_create(const char *name,
>>         ODP_PAGE_SIZE, 0);
>>                                 if (shm == ODP_SHM_INVALID) {
>>         POOL_UNLOCK(&pool->s.lock);
>>         -                               return ODP_BUFFER_INVALID;
>>         +                               return ODP_BUFFER_POOL_INVALID;
>>                                 }
>>                                 pool->s.pool_base_addr =
>>         odp_shm_addr(shm);
>>                         } else {
>>
>>
>>
>>     _______________________________________________
>>     lng-odp mailing list
>>     lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org>
>>     http://lists.linaro.org/mailman/listinfo/lng-odp
>>
>>
>>
>> --
>> *Mike Holmes*
>> Linaro  Sr Technical Manager
>> LNG - ODP
>>
>
>
> _______________________________________________
> lng-odp mailing list
> lng-odp@lists.linaro.org
> http://lists.linaro.org/mailman/listinfo/lng-odp
>
diff mbox

Patch

diff --git a/platform/linux-generic/odp_buffer_pool.c b/platform/linux-generic/odp_buffer_pool.c
index e947dde..4c8b037 100644
--- a/platform/linux-generic/odp_buffer_pool.c
+++ b/platform/linux-generic/odp_buffer_pool.c
@@ -234,7 +234,7 @@  odp_buffer_pool_t odp_buffer_pool_create(const char *name,
 					      ODP_PAGE_SIZE, 0);
 			if (shm == ODP_SHM_INVALID) {
 				POOL_UNLOCK(&pool->s.lock);
-				return ODP_BUFFER_INVALID;
+				return ODP_BUFFER_POOL_INVALID;
 			}
 			pool->s.pool_base_addr = odp_shm_addr(shm);
 		} else {