Re: [tip:core/futexes] futex: additional (get|put)_futex_key() fixes

Darren Hart
2009-03-13T05:46:40Z

Ingo Molnar wrote:
> * Darren Hart <dvhltc@us.ibm.com> wrote:
>
>> @@ -1595,13 +1601,12 @@ uaddr_faulted:
>>
>> ret = get_user(uval, uaddr);
>> if (!ret)
>> - goto retry;
>> + goto retry_unlocked;
>>
>> - if (to)
>> - destroy_hrtimer_on_stack(&to->timer);
>> - return ret;
>> + goto out_put_key;
>
> hm, was that destroy_hrtimer_on_stack() removal intended? It's
> not directly commented on in the changelog.

Yes, rather than duplicate the cleanup logic, I replaced it with the
"goto out_put_key;", which also drops the futex_key, which was missing
in the original exit path.

Thanks,

--
Darren Hart
IBM Linux Technology Center
Real-Time Linux Team