From b4e8f930f8cf6ae27d48c044c6a0748cacb99d54 Mon Sep 17 00:00:00 2001
From: Kai Makisara <Kai.Makisara@kolumbus.fi>
Date: Fri, 11 Jul 2008 15:06:40 +0300
Subject: [PATCH] --- yaml --- r: 106570 b: refs/heads/master c:
 786231af0a4ac6d78cef51fa7e9c3dd63f016195 h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/scsi/st.c | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 5f6d7f860b34..19e7277aba7e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 626dcb1ee39aa1010c27df31970ff0ecfb287208
+refs/heads/master: 786231af0a4ac6d78cef51fa7e9c3dd63f016195
diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c
index 41b1f81b1651..c2bb53e3d941 100644
--- a/trunk/drivers/scsi/st.c
+++ b/trunk/drivers/scsi/st.c
@@ -631,7 +631,7 @@ static int cross_eof(struct scsi_tape * STp, int forward)
 /* Flush the write buffer (never need to write if variable blocksize). */
 static int st_flush_write_buffer(struct scsi_tape * STp)
 {
-	int offset, transfer, blks;
+	int transfer, blks;
 	int result;
 	unsigned char cmd[MAX_COMMAND_SIZE];
 	struct st_request *SRpnt;
@@ -644,14 +644,10 @@ static int st_flush_write_buffer(struct scsi_tape * STp)
 	result = 0;
 	if (STp->dirty == 1) {
 
-		offset = (STp->buffer)->buffer_bytes;
-		transfer = ((offset + STp->block_size - 1) /
-			    STp->block_size) * STp->block_size;
+		transfer = STp->buffer->buffer_bytes;
                 DEBC(printk(ST_DEB_MSG "%s: Flushing %d bytes.\n",
                                tape_name(STp), transfer));
 
-		memset((STp->buffer)->b_data + offset, 0, transfer - offset);
-
 		memset(cmd, 0, MAX_COMMAND_SIZE);
 		cmd[0] = WRITE_6;
 		cmd[1] = 1;