1 files changed, 16 insertions, 14 deletions

diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 12d58a7ed6bc..3ea1a713ef25 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -27,6 +27,7 @@ static const char *verstr = "20081215";
 #include <linux/mm.h>
 #include <linux/init.h>
 #include <linux/string.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/mtio.h>
 #include <linux/cdrom.h>
@@ -552,13 +553,15 @@ st_do_scsi(struct st_request * SRpnt, struct scsi_tape * STp, unsigned char *cmd
         SRpnt->waiting = waiting;
 
         if (STp->buffer->do_dio) {
+                mdata->page_order = 0;
                 mdata->nr_entries = STp->buffer->sg_segs;
                 mdata->pages = STp->buffer->mapped_pages;
         } else {
+                mdata->page_order = STp->buffer->reserved_page_order;
                 mdata->nr_entries =
                         DIV_ROUND_UP(bytes, PAGE_SIZE << mdata->page_order);
-                STp->buffer->map_data.pages = STp->buffer->reserved_pages;
-                STp->buffer->map_data.offset = 0;
+                mdata->pages = STp->buffer->reserved_pages;
+                mdata->offset = 0;
         }
 
         memcpy(SRpnt->cmd, cmd, sizeof(SRpnt->cmd));
@@ -2280,7 +2283,8 @@ static int st_set_options(struct scsi_tape *STp, long options)
         } else if (code == MT_ST_SET_CLN) {
                 value = (options & ~MT_ST_OPTIONS) & 0xff;
                 if (value != 0 &&
-                    value < EXTENDED_SENSE_START && value >= SCSI_SENSE_BUFFERSIZE)
+                        (value < EXTENDED_SENSE_START ||
+                                value >= SCSI_SENSE_BUFFERSIZE))
                         return (-EINVAL);
                 STp->cln_mode = value;
                 STp->cln_sense_mask = (options >> 8) & 0xff;
@@ -3718,7 +3722,7 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm
                 priority |= __GFP_ZERO;
 
         if (STbuffer->frp_segs) {
-                order = STbuffer->map_data.page_order;
+                order = STbuffer->reserved_page_order;
                 b_size = PAGE_SIZE << order;
         } else {
                 for (b_size = PAGE_SIZE, order = 0;
@@ -3751,7 +3755,7 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm
                 segs++;
         }
         STbuffer->b_data = page_address(STbuffer->reserved_pages[0]);
-        STbuffer->map_data.page_order = order;
+        STbuffer->reserved_page_order = order;
 
         return 1;
 }
@@ -3764,7 +3768,7 @@ static void clear_buffer(struct st_buffer * st_bp)
 
         for (i=0; i < st_bp->frp_segs; i++)
                 memset(page_address(st_bp->reserved_pages[i]), 0,
-                       PAGE_SIZE << st_bp->map_data.page_order);
+                       PAGE_SIZE << st_bp->reserved_page_order);
         st_bp->cleared = 1;
 }
 
@@ -3772,7 +3776,7 @@ static void clear_buffer(struct st_buffer * st_bp)
 /* Release the extra buffer */
 static void normalize_buffer(struct st_buffer * STbuffer)
 {
-        int i, order = STbuffer->map_data.page_order;
+        int i, order = STbuffer->reserved_page_order;
 
         for (i = 0; i < STbuffer->frp_segs; i++) {
                 __free_pages(STbuffer->reserved_pages[i], order);
@@ -3780,7 +3784,7 @@ static void normalize_buffer(struct st_buffer * STbuffer)
         }
         STbuffer->frp_segs = 0;
         STbuffer->sg_segs = 0;
-        STbuffer->map_data.page_order = 0;
+        STbuffer->reserved_page_order = 0;
         STbuffer->map_data.offset = 0;
 }
 
@@ -3790,7 +3794,7 @@ static void normalize_buffer(struct st_buffer * STbuffer)
 static int append_to_buffer(const char __user *ubp, struct st_buffer * st_bp, int do_count)
 {
         int i, cnt, res, offset;
-        int length = PAGE_SIZE << st_bp->map_data.page_order;
+        int length = PAGE_SIZE << st_bp->reserved_page_order;
 
         for (i = 0, offset = st_bp->buffer_bytes;
              i < st_bp->frp_segs && offset >= length; i++)
@@ -3822,7 +3826,7 @@ static int append_to_buffer(const char __user *ubp, struct st_buffer * st_bp, in
 static int from_buffer(struct st_buffer * st_bp, char __user *ubp, int do_count)
 {
         int i, cnt, res, offset;
-        int length = PAGE_SIZE << st_bp->map_data.page_order;
+        int length = PAGE_SIZE << st_bp->reserved_page_order;
 
         for (i = 0, offset = st_bp->read_pointer;
              i < st_bp->frp_segs && offset >= length; i++)
@@ -3855,7 +3859,7 @@ static void move_buffer_data(struct st_buffer * st_bp, int offset)
 {
         int src_seg, dst_seg, src_offset = 0, dst_offset;
         int count, total;
-        int length = PAGE_SIZE << st_bp->map_data.page_order;
+        int length = PAGE_SIZE << st_bp->reserved_page_order;
 
         if (offset == 0)
                 return;
@@ -3980,8 +3984,7 @@ static int st_probe(struct device *dev)
                 return -ENODEV;
         }
 
-        i = min(queue_max_hw_segments(SDp->request_queue),
-                queue_max_phys_segments(SDp->request_queue));
+        i = queue_max_segments(SDp->request_queue);
         if (st_max_sg_segs < i)
                 i = st_max_sg_segs;
         buffer = new_tape_buffer((SDp->host)->unchecked_isa_dma, i);
@@ -4577,7 +4580,6 @@ static int sgl_map_user_pages(struct st_buffer *STbp,
         }
 
         mdata->offset = uaddr & ~PAGE_MASK;
-        mdata->page_order = 0;
         STbp->mapped_pages = pages;
 
         return nr_pages;