diff options
Diffstat (limited to 'drivers/scsi/libsrp.c')
-rw-r--r-- | drivers/scsi/libsrp.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c index b1b5e51ca8e3..db1b41c55fd3 100644 --- a/drivers/scsi/libsrp.c +++ b/drivers/scsi/libsrp.c | |||
@@ -58,8 +58,7 @@ static int srp_iu_pool_alloc(struct srp_queue *q, size_t max, | |||
58 | goto free_pool; | 58 | goto free_pool; |
59 | 59 | ||
60 | spin_lock_init(&q->lock); | 60 | spin_lock_init(&q->lock); |
61 | kfifo_init(&q->queue, (void *) q->pool, max * sizeof(void *), | 61 | kfifo_init(&q->queue, (void *) q->pool, max * sizeof(void *)); |
62 | &q->lock); | ||
63 | 62 | ||
64 | for (i = 0, iue = q->items; i < max; i++) { | 63 | for (i = 0, iue = q->items; i < max; i++) { |
65 | __kfifo_put(&q->queue, (void *) &iue, sizeof(void *)); | 64 | __kfifo_put(&q->queue, (void *) &iue, sizeof(void *)); |
@@ -164,7 +163,8 @@ struct iu_entry *srp_iu_get(struct srp_target *target) | |||
164 | { | 163 | { |
165 | struct iu_entry *iue = NULL; | 164 | struct iu_entry *iue = NULL; |
166 | 165 | ||
167 | kfifo_get(&target->iu_queue.queue, (void *) &iue, sizeof(void *)); | 166 | kfifo_get_locked(&target->iu_queue.queue, (void *) &iue, |
167 | sizeof(void *), &target->iu_queue.lock); | ||
168 | if (!iue) | 168 | if (!iue) |
169 | return iue; | 169 | return iue; |
170 | iue->target = target; | 170 | iue->target = target; |
@@ -176,7 +176,8 @@ EXPORT_SYMBOL_GPL(srp_iu_get); | |||
176 | 176 | ||
177 | void srp_iu_put(struct iu_entry *iue) | 177 | void srp_iu_put(struct iu_entry *iue) |
178 | { | 178 | { |
179 | kfifo_put(&iue->target->iu_queue.queue, (void *) &iue, sizeof(void *)); | 179 | kfifo_put_locked(&iue->target->iu_queue.queue, (void *) &iue, |
180 | sizeof(void *), &iue->target->iu_queue.lock); | ||
180 | } | 181 | } |
181 | EXPORT_SYMBOL_GPL(srp_iu_put); | 182 | EXPORT_SYMBOL_GPL(srp_iu_put); |
182 | 183 | ||