|
@@ -102,7 +102,7 @@ static inline bool ptr_ring_full_bh(struct ptr_ring *r)
|
|
|
*/
|
|
|
static inline int __ptr_ring_produce(struct ptr_ring *r, void *ptr)
|
|
|
{
|
|
|
- if (r->queue[r->producer])
|
|
|
+ if (unlikely(!r->size) || r->queue[r->producer])
|
|
|
return -ENOSPC;
|
|
|
|
|
|
r->queue[r->producer++] = ptr;
|
|
@@ -164,7 +164,9 @@ static inline int ptr_ring_produce_bh(struct ptr_ring *r, void *ptr)
|
|
|
*/
|
|
|
static inline void *__ptr_ring_peek(struct ptr_ring *r)
|
|
|
{
|
|
|
- return r->queue[r->consumer];
|
|
|
+ if (likely(r->size))
|
|
|
+ return r->queue[r->consumer];
|
|
|
+ return NULL;
|
|
|
}
|
|
|
|
|
|
/* Note: callers invoking this in a loop must use a compiler barrier,
|