[SCSI] sg direct io/mmap oops, st sync

This patch adopts the same solution as proposed by Kai M. in
a post titled: "[PATCH] SCSI tape signed/unsigned fix".
The fix is in a function that the sg driver borrowed from
the st driver so its maintenance is a little easier if
the functions remain the same after the fix.

   - change nr_pages type from unsigned to signed so errors
     from get_user_pages() call are properly handled

Signed-off-by: Douglas Gilbert <dougg@torque.net>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

1 files changed, 4 insertions, 4 deletions

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 14fb179b3842..616c3f3e62fc 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -61,7 +61,7 @@ static int sg_version_num = 30533;	/* 2 digits for each component */
 
 #ifdef CONFIG_SCSI_PROC_FS
 #include <linux/proc_fs.h>
-static char *sg_version_date = "20050328";
+static char *sg_version_date = "20050901";
 
 static int sg_proc_init(void);
 static void sg_proc_cleanup(void);
@@ -1794,12 +1794,12 @@ st_map_user_pages(struct scatterlist *sgl, const unsigned int max_pages,
                   unsigned long uaddr, size_t count, int rw,
                   unsigned long max_pfn)
 {
+        unsigned long end = (uaddr + count + PAGE_SIZE - 1) >> PAGE_SHIFT;
+        unsigned long start = uaddr >> PAGE_SHIFT;
+        const int nr_pages = end - start;
         int res, i, j;
-        unsigned int nr_pages;
         struct page **pages;
 
-        nr_pages = ((uaddr & ~PAGE_MASK) + count + ~PAGE_MASK) >> PAGE_SHIFT;
-
         /* User attempted Overflow! */
         if ((uaddr + count) < uaddr)
                 return -EINVAL;