Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 22 insertions, 30 deletions

diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c
index dd098cad337b..1c08f6164658 100644
--- a/drivers/scsi/scsi.c
+++ b/drivers/scsi/scsi.c
@@ -940,10 +940,16 @@ EXPORT_SYMBOL(scsi_adjust_queue_depth);
  */
 int scsi_track_queue_full(struct scsi_device *sdev, int depth)
 {
-        if ((jiffies >> 4) == sdev->last_queue_full_time)
+
+        /*
+         * Don't let QUEUE_FULLs on the same
+         * jiffies count, they could all be from
+         * same event.
+         */
+        if ((jiffies >> 4) == (sdev->last_queue_full_time >> 4))
                 return 0;
 
-        sdev->last_queue_full_time = (jiffies >> 4);
+        sdev->last_queue_full_time = jiffies;
         if (sdev->last_queue_full_depth != depth) {
                 sdev->last_queue_full_count = 1;
                 sdev->last_queue_full_depth = depth;
@@ -1012,6 +1018,8 @@ static int scsi_vpd_inquiry(struct scsi_device *sdev, unsigned char *buffer,
  * scsi_get_vpd_page - Get Vital Product Data from a SCSI device
  * @sdev: The device to ask
  * @page: Which Vital Product Data to return
+ * @buf: where to store the VPD
+ * @buf_len: number of bytes in the VPD buffer area
  *
  * SCSI devices may optionally supply Vital Product Data.  Each 'page'
  * of VPD is defined in the appropriate SCSI document (eg SPC, SBC).
@@ -1020,55 +1028,39 @@ static int scsi_vpd_inquiry(struct scsi_device *sdev, unsigned char *buffer,
  * responsible for calling kfree() on this pointer when it is no longer
  * needed.  If we cannot retrieve the VPD page this routine returns %NULL.
  */
-unsigned char *scsi_get_vpd_page(struct scsi_device *sdev, u8 page)
+int scsi_get_vpd_page(struct scsi_device *sdev, u8 page, unsigned char *buf,
+                      int buf_len)
 {
         int i, result;
-        unsigned int len;
-        const unsigned int init_vpd_len = 255;
-        unsigned char *buf = kmalloc(init_vpd_len, GFP_KERNEL);
-
-        if (!buf)
-                return NULL;
 
         /* Ask for all the pages supported by this device */
-        result = scsi_vpd_inquiry(sdev, buf, 0, init_vpd_len);
+        result = scsi_vpd_inquiry(sdev, buf, 0, buf_len);
         if (result)
                 goto fail;
 
         /* If the user actually wanted this page, we can skip the rest */
         if (page == 0)
-                return buf;
+                return -EINVAL;
 
-        for (i = 0; i < buf[3]; i++)
+        for (i = 0; i < min((int)buf[3], buf_len - 4); i++)
                 if (buf[i + 4] == page)
                         goto found;
+
+        if (i < buf[3] && i > buf_len)
+                /* ran off the end of the buffer, give us benefit of doubt */
+                goto found;
         /* The device claims it doesn't support the requested page */
         goto fail;
 
  found:
-        result = scsi_vpd_inquiry(sdev, buf, page, 255);
-        if (result)
-                goto fail;
-
-        /*
-         * Some pages are longer than 255 bytes.  The actual length of
-         * the page is returned in the header.
-         */
-        len = ((buf[2] << 8) | buf[3]) + 4;
-        if (len <= init_vpd_len)
-                return buf;
-
-        kfree(buf);
-        buf = kmalloc(len, GFP_KERNEL);
-        result = scsi_vpd_inquiry(sdev, buf, page, len);
+        result = scsi_vpd_inquiry(sdev, buf, page, buf_len);
         if (result)
                 goto fail;
 
-        return buf;
+        return 0;
 
  fail:
-        kfree(buf);
-        return NULL;
+        return -EINVAL;
 }
 EXPORT_SYMBOL_GPL(scsi_get_vpd_page);