aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/libiscsi.c
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2008-12-02 01:32:09 -0500
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2008-12-29 12:24:21 -0500
commitcfeb2cf957ca5b4e557b53fb91ccc52f442f6dbe (patch)
tree71e1ccecf6626c09f42ae1f324809e504dc60a36 /drivers/scsi/libiscsi.c
parente2bac7c55e43c9018f2f4daf15437e836b26e709 (diff)
[SCSI] libiscsi: change login data buffer allocation
This modifies the login buffer allocation to use __get_free_pages. It will allow drivers that want to send this data with zero copy operations to easily line things up on page boundaries. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi/libiscsi.c')
-rw-r--r--drivers/scsi/libiscsi.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/scsi/libiscsi.c b/drivers/scsi/libiscsi.c
index 80cbcdce7fa..c1bb74052ae 100644
--- a/drivers/scsi/libiscsi.c
+++ b/drivers/scsi/libiscsi.c
@@ -2284,7 +2284,8 @@ iscsi_conn_setup(struct iscsi_cls_session *cls_session, int dd_size,
2284 } 2284 }
2285 spin_unlock_bh(&session->lock); 2285 spin_unlock_bh(&session->lock);
2286 2286
2287 data = kmalloc(ISCSI_DEF_MAX_RECV_SEG_LEN, GFP_KERNEL); 2287 data = (char *) __get_free_pages(GFP_KERNEL,
2288 get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
2288 if (!data) 2289 if (!data)
2289 goto login_task_data_alloc_fail; 2290 goto login_task_data_alloc_fail;
2290 conn->login_task->data = conn->data = data; 2291 conn->login_task->data = conn->data = data;
@@ -2355,7 +2356,8 @@ void iscsi_conn_teardown(struct iscsi_cls_conn *cls_conn)
2355 iscsi_suspend_tx(conn); 2356 iscsi_suspend_tx(conn);
2356 2357
2357 spin_lock_bh(&session->lock); 2358 spin_lock_bh(&session->lock);
2358 kfree(conn->data); 2359 free_pages((unsigned long) conn->data,
2360 get_order(ISCSI_DEF_MAX_RECV_SEG_LEN));
2359 kfree(conn->persistent_address); 2361 kfree(conn->persistent_address);
2360 __kfifo_put(session->cmdpool.queue, (void*)&conn->login_task, 2362 __kfifo_put(session->cmdpool.queue, (void*)&conn->login_task,
2361 sizeof(void*)); 2363 sizeof(void*));