From: Jammy Zhou Date: Wed, 21 Jan 2015 10:35:47 +0000 (+0800) Subject: reservation: wait only with non-zero timeout specified (v3) X-Git-Tag: v4.0-rc3~20^2~2 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fb8b7d2b9d80e1e71f379e57355936bd2b024be9;p=karo-tx-linux.git reservation: wait only with non-zero timeout specified (v3) When the timeout value passed to reservation_object_wait_timeout_rcu is zero, no wait should be done if the fences are not signaled. Return '1' for idle and '0' for busy if the specified timeout is '0' to keep consistent with the case of non-zero timeout. v2: call fence_put if not signaled in the case of timeout==0 v3: switch to reservation_object_test_signaled_rcu Signed-off-by: Jammy Zhou Reviewed-by: Christian König Reviewed-by: Alex Deucher Reviewed-By: Maarten Lankhorst Signed-off-by: Sumit Semwal --- diff --git a/drivers/dma-buf/reservation.c b/drivers/dma-buf/reservation.c index 3c97c8fa8d02..807ef1555255 100644 --- a/drivers/dma-buf/reservation.c +++ b/drivers/dma-buf/reservation.c @@ -327,6 +327,9 @@ long reservation_object_wait_timeout_rcu(struct reservation_object *obj, unsigned seq, shared_count, i = 0; long ret = timeout; + if (!timeout) + return reservation_object_test_signaled_rcu(obj, wait_all); + retry: fence = NULL; shared_count = 0;