aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libiscsi.c
diff options
context:
space:
mode:
authorStefani Seibold <stefani@seibold.net>2009-12-21 17:37:28 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-22 17:17:56 -0500
commite64c026dd09b73faf20707711402fc5ed55a8e70 (patch)
tree4780736e021824f15329a0826eff3cc27d3f9646 /drivers/scsi/libiscsi.c
parentc1e13f25674ed564948ecb7dfe5f83e578892896 (diff)
kfifo: cleanup namespace
change name of __kfifo_* functions to kfifo_*, because the prefix __kfifo should be reserved for internal functions only. Signed-off-by: Stefani Seibold <stefani@seibold.net> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> Acked-by: Mauro Carvalho Chehab <mchehab@redhat.com> Acked-by: Andi Kleen <ak@linux.intel.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
-rw-r--r--drivers/scsi/libiscsi.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 1bccbc1e588e..5f0c46f43ee1 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -517,7 +517,7 @@ static void iscsi_free_task(struct iscsi_task *task)
517 if (conn->login_task == task) 517 if (conn->login_task == task)
518 return; 518 return;
519 519
520 __kfifo_put(&session->cmdpool.queue, (void*)&task, sizeof(void*)); 520 kfifo_put(&session->cmdpool.queue, (void*)&task, sizeof(void*));
521 521
522 if (sc) { 522 if (sc) {
523 task->sc = NULL; 523 task->sc = NULL;
@@ -737,7 +737,7 @@ __iscsi_conn_send_pdu(struct iscsi_conn *conn, struct iscsi_hdr *hdr,
737 BUG_ON(conn->c_stage == ISCSI_CONN_INITIAL_STAGE); 737 BUG_ON(conn->c_stage == ISCSI_CONN_INITIAL_STAGE);
738 BUG_ON(conn->c_stage == ISCSI_CONN_STOPPED); 738 BUG_ON(conn->c_stage == ISCSI_CONN_STOPPED);
739 739
740 if (!__kfifo_get(&session->cmdpool.queue, 740 if (!kfifo_get(&session->cmdpool.queue,
741 (void*)&task, sizeof(void*))) 741 (void*)&task, sizeof(void*)))
742 return NULL; 742 return NULL;
743 } 743 }
@@ -1567,7 +1567,7 @@ static inline struct iscsi_task *iscsi_alloc_task(struct iscsi_conn *conn,
1567{ 1567{
1568 struct iscsi_task *task; 1568 struct iscsi_task *task;
1569 1569
1570 if (!__kfifo_get(&conn->session->cmdpool.queue, 1570 if (!kfifo_get(&conn->session->cmdpool.queue,
1571 (void *) &task, sizeof(void *))) 1571 (void *) &task, sizeof(void *)))
1572 return NULL; 1572 return NULL;
1573 1573
@@ -2469,7 +2469,7 @@ iscsi_pool_init(struct iscsi_pool *q, int max, void ***items, int item_size)
2469 q->max = i; 2469 q->max = i;
2470 goto enomem; 2470 goto enomem;
2471 } 2471 }
2472 __kfifo_put(&q->queue, (void*)&q->pool[i], sizeof(void*)); 2472 kfifo_put(&q->queue, (void*)&q->pool[i], sizeof(void*));
2473 } 2473 }
2474 2474
2475 if (items) { 2475 if (items) {
@@ -2819,7 +2819,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
2819 2819
2820 /* allocate login_task used for the login/text sequences */ 2820 /* allocate login_task used for the login/text sequences */
2821 spin_lock_bh(&session->lock); 2821 spin_lock_bh(&session->lock);
2822 if (!__kfifo_get(&session->cmdpool.queue, 2822 if (!kfifo_get(&session->cmdpool.queue,
2823 (void*)&conn->login_task, 2823 (void*)&conn->login_task,
2824 sizeof(void*))) { 2824 sizeof(void*))) {
2825 spin_unlock_bh(&session->lock); 2825 spin_unlock_bh(&session->lock);
@@ -2839,7 +2839,7 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
2839 return cls_conn; 2839 return cls_conn;
2840 2840
2841login_task_data_alloc_fail: 2841login_task_data_alloc_fail:
2842 __kfifo_put(&session->cmdpool.queue, (void*)&conn->login_task, 2842 kfifo_put(&session->cmdpool.queue, (void*)&conn->login_task,
2843 sizeof(void*)); 2843 sizeof(void*));
2844login_task_alloc_fail: 2844login_task_alloc_fail:
2845 iscsi_destroy_conn(cls_conn); 2845 iscsi_destroy_conn(cls_conn);
@@ -2902,7 +2902,7 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
2902 free_pages((unsigned long) conn->data, 2902 free_pages((unsigned long) conn->data,
2903 get_order(ISCSI_DEF_MAX_RECV_SEG_LEN)); 2903 get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
2904 kfree(conn->persistent_address); 2904 kfree(conn->persistent_address);
2905 __kfifo_put(&session->cmdpool.queue, (void*)&conn->login_task, 2905 kfifo_put(&session->cmdpool.queue, (void*)&conn->login_task,
2906 sizeof(void*)); 2906 sizeof(void*));
2907 if (session->leadconn == conn) 2907 if (session->leadconn == conn)
2908 session->leadconn = NULL; 2908 session->leadconn = NULL;