[SCSI] st: Store page order before driver buffer allocation
authorKai Makisara <Kai.Makisara@kolumbus.fi>
Mon, 20 Dec 2010 16:43:39 +0000 (18:43 +0200)
committerJames Bottomley <James.Bottomley@suse.de>
Thu, 23 Dec 2010 05:26:50 +0000 (23:26 -0600)
The order of the pages allocated for the driver buffer must be stored before
allocation because it is used in freeing already allocated pages if
allocation fails.

Signed-off-by: Kai Makisara <kai.makisara@kolumbus.fi>
Reported-by: Lukas Kolbe <lkolbe@techfak.uni-bielefeld.de>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/st.c

index 5b7388f1c83545975b4ebcad9a73f62cb7669f36..12a36acae0b0509b96b3322abb875478c1ee6b63 100644 (file)
@@ -17,7 +17,7 @@
    Last modified: 18-JAN-1998 Richard Gooch <rgooch@atnf.csiro.au> Devfs support
  */
 
-static const char *verstr = "20100829";
+static const char *verstr = "20101219";
 
 #include <linux/module.h>
 
@@ -3732,6 +3732,7 @@ static int enlarge_buffer(struct st_buffer * STbuffer, int new_size, int need_dm
                     order < ST_MAX_ORDER && b_size < new_size;
                     order++, b_size *= 2)
                        ;  /* empty */
+               STbuffer->reserved_page_order = order;
        }
        if (max_segs * (PAGE_SIZE << order) < new_size) {
                if (order == ST_MAX_ORDER)
@@ -3758,7 +3759,6 @@ 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->reserved_page_order = order;
 
        return 1;
 }