aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libsrp.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/libsrp.c')
-rw-r--r--drivers/scsi/libsrp.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/scsi/libsrp.c b/drivers/scsi/libsrp.c
index 9ad38e81e343..b1b5e51ca8e3 100644
--- a/drivers/scsi/libsrp.c
+++ b/drivers/scsi/libsrp.c
@@ -58,19 +58,16 @@ 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 q->queue = kfifo_init((void *) q->pool, max * sizeof(void *), 61 kfifo_init(&q->queue, (void *) q->pool, max * sizeof(void *),
62 GFP_KERNEL, &q->lock); 62 &q->lock);
63 if (IS_ERR(q->queue))
64 goto free_item;
65 63
66 for (i = 0, iue = q->items; i < max; i++) { 64 for (i = 0, iue = q->items; i < max; i++) {
67 __kfifo_put(q->queue, (void *) &iue, sizeof(void *)); 65 __kfifo_put(&q->queue, (void *) &iue, sizeof(void *));
68 iue->sbuf = ring[i]; 66 iue->sbuf = ring[i];
69 iue++; 67 iue++;
70 } 68 }
71 return 0; 69 return 0;
72 70
73free_item:
74 kfree(q->items); 71 kfree(q->items);
75free_pool: 72free_pool:
76 kfree(q->pool); 73 kfree(q->pool);
@@ -167,7 +164,7 @@ struct iu_entry *srp_iu_get(struct srp_target *target)
167{ 164{
168 struct iu_entry *iue = NULL; 165 struct iu_entry *iue = NULL;
169 166
170 kfifo_get(target->iu_queue.queue, (void *) &iue, sizeof(void *)); 167 kfifo_get(&target->iu_queue.queue, (void *) &iue, sizeof(void *));
171 if (!iue) 168 if (!iue)
172 return iue; 169 return iue;
173 iue->target = target; 170 iue->target = target;
@@ -179,7 +176,7 @@ EXPORT_SYMBOL_GPL(srp_iu_get);
179 176
180void srp_iu_put(struct iu_entry *iue) 177void srp_iu_put(struct iu_entry *iue)
181{ 178{
182 kfifo_put(iue->target->iu_queue.queue, (void *) &iue, sizeof(void *)); 179 kfifo_put(&iue->target->iu_queue.queue, (void *) &iue, sizeof(void *));
183} 180}
184EXPORT_SYMBOL_GPL(srp_iu_put); 181EXPORT_SYMBOL_GPL(srp_iu_put);
185 182