aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/scsi/st.c2
-rw-r--r--drivers/scsi/st.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 50dbe14db37b..fe4c20259bca 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -1524,7 +1524,6 @@ static int setup_buffering(struct scsi_tape *STp, const char __user *buf,
1524 else 1524 else
1525 STbp->do_dio = 0; /* fall back to buffering with any error */ 1525 STbp->do_dio = 0; /* fall back to buffering with any error */
1526 STbp->sg_segs = STbp->do_dio; 1526 STbp->sg_segs = STbp->do_dio;
1527 STbp->frp_sg_current = 0;
1528 DEB( 1527 DEB(
1529 if (STbp->do_dio) { 1528 if (STbp->do_dio) {
1530 STp->nbr_dio++; 1529 STp->nbr_dio++;
@@ -3844,7 +3843,6 @@ static void normalize_buffer(struct st_buffer * STbuffer)
3844 STbuffer->buffer_size -= (PAGE_SIZE << order); 3843 STbuffer->buffer_size -= (PAGE_SIZE << order);
3845 } 3844 }
3846 STbuffer->frp_segs = 0; 3845 STbuffer->frp_segs = 0;
3847 STbuffer->frp_sg_current = 0;
3848 STbuffer->sg_segs = 0; 3846 STbuffer->sg_segs = 0;
3849 STbuffer->map_data.page_order = 0; 3847 STbuffer->map_data.page_order = 0;
3850 STbuffer->map_data.offset = 0; 3848 STbuffer->map_data.offset = 0;
diff --git a/drivers/scsi/st.h b/drivers/scsi/st.h
index e682f8045034..544dc6b1f548 100644
--- a/drivers/scsi/st.h
+++ b/drivers/scsi/st.h
@@ -52,7 +52,6 @@ struct st_buffer {
52 unsigned short use_sg; /* zero or max number of s/g segments for this adapter */ 52 unsigned short use_sg; /* zero or max number of s/g segments for this adapter */
53 unsigned short sg_segs; /* number of segments in s/g list */ 53 unsigned short sg_segs; /* number of segments in s/g list */
54 unsigned short frp_segs; /* number of buffer segments */ 54 unsigned short frp_segs; /* number of buffer segments */
55 unsigned int frp_sg_current; /* driver buffer length currently in s/g list */
56}; 55};
57 56
58/* The tape mode definition */ 57/* The tape mode definition */