From b9b8c9519448dc9653faeff5ae0eccb41a0f173c Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Thu, 18 Dec 2008 14:49:44 +0900
Subject: [PATCH] --- yaml --- r: 127887 b: refs/heads/master c:
 b3376b4aaab4c348dfd2e0b7595dc12f64c9fac9 h: refs/heads/master i:   127885:
 d33459970020aec7b25d7f3181c567ab867962ec   127883:
 743ffea42cfb37905a3a66437347523a393e4e74   127879:
 42aef75c5615ba1ed42174b836f327524b4a91ed   127871:
 262e8f9fff361d9e29807e986ffb226474ec123f v: v3

---
 [refs]                  |  2 +-
 trunk/drivers/scsi/st.c | 29 -----------------------------
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/[refs] b/[refs]
index 95eaa1d082b8..561264129c76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6620742f72d2fcf311e3fc8aa2476daa91fa3f31
+refs/heads/master: b3376b4aaab4c348dfd2e0b7595dc12f64c9fac9
diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c
index fec5568c711a..ce1fd3ab243b 100644
--- a/trunk/drivers/scsi/st.c
+++ b/trunk/drivers/scsi/st.c
@@ -189,7 +189,6 @@ static void normalize_buffer(struct st_buffer *);
 static int append_to_buffer(const char __user *, struct st_buffer *, int);
 static int from_buffer(struct st_buffer *, char __user *, int);
 static void move_buffer_data(struct st_buffer *, int);
-static void buf_to_sg(struct st_buffer *, unsigned int);
 
 static int sgl_map_user_pages(struct st_buffer *, const unsigned int,
 			      unsigned long, size_t, int);
@@ -554,8 +553,6 @@ st_do_scsi(struct st_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd
 		mdata->nr_entries = STp->buffer->sg_segs;
 		mdata->pages = STp->buffer->mapped_pages;
 	} else {
-		buf_to_sg(STp->buffer, bytes);
-
 		mdata->nr_entries =
 			DIV_ROUND_UP(bytes, PAGE_SIZE << mdata->page_order);
 		STp->buffer->map_data.pages = STp->buffer->reserved_pages;
@@ -3964,32 +3961,6 @@ static void move_buffer_data(struct st_buffer * st_bp, int offset)
 	}
 }
 
-
-/* Fill the s/g list up to the length required for this transfer */
-static void buf_to_sg(struct st_buffer *STbp, unsigned int length)
-{
-	int i;
-	unsigned int count;
-	struct scatterlist *sg;
-	struct st_buf_fragment *frp;
-
-	if (length == STbp->frp_sg_current)
-		return;   /* work already done */
-
-	sg = &(STbp->sg[0]);
-	frp = STbp->frp;
-	for (i=count=0; count < length; i++) {
-		if (length - count > frp[i].length)
-			sg_set_page(&sg[i], frp[i].page, frp[i].length, 0);
-		else
-			sg_set_page(&sg[i], frp[i].page, length - count, 0);
-		count += sg[i].length;
-	}
-	STbp->sg_segs = i;
-	STbp->frp_sg_current = length;
-}
-
-
 /* Validate the options from command line or module parameters */
 static void validate_options(void)
 {