3 files changed, 31 insertions, 21 deletions

diff --git a/drivers/block/aoe/aoeblk.c b/drivers/block/aoe/aoeblk.c
index d433f27e0ce2..aa25f8b09fe3 100644
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
@@ -68,6 +68,7 @@ static struct attribute *aoe_attrs[] = {
         &disk_attr_mac.attr,
         &disk_attr_netif.attr,
         &disk_attr_fwver.attr,
+        NULL
 };
 
 static const struct attribute_group attr_group = {
diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index dcccaf2782f3..4105c3bf3476 100644
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1300,6 +1300,12 @@ static void cciss_softirq_done(struct request *rq)
 
         complete_buffers(rq->bio, rq->errors);
 
+        if (blk_fs_request(rq)) {
+                const int rw = rq_data_dir(rq);
+
+                disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
+        }
+
 #ifdef CCISS_DEBUG
         printk("Done with %p\n", rq);
 #endif                          /* CCISS_DEBUG */
@@ -1923,7 +1929,6 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
 {
         int return_code;
         unsigned long t;
-        unsigned long rem;
 
         memset(inq_buff, 0, sizeof(InquiryData_struct));
         if (withirq)
@@ -1939,26 +1944,23 @@ static void cciss_geometry_inquiry(int ctlr, int logvol,
                         printk(KERN_WARNING
                                "cciss: reading geometry failed, volume "
                                "does not support reading geometry\n");
-                        drv->block_size = block_size;
-                        drv->nr_blocks = total_size;
                         drv->heads = 255;
                         drv->sectors = 32;      // Sectors per track
-                        t = drv->heads * drv->sectors;
-                        drv->cylinders = total_size;
-                        rem = do_div(drv->cylinders, t);
                 } else {
-                        drv->block_size = block_size;
-                        drv->nr_blocks = total_size;
                         drv->heads = inq_buff->data_byte[6];
                         drv->sectors = inq_buff->data_byte[7];
                         drv->cylinders = (inq_buff->data_byte[4] & 0xff) << 8;
                         drv->cylinders += inq_buff->data_byte[5];
                         drv->raid_level = inq_buff->data_byte[8];
-                        t = drv->heads * drv->sectors;
-                        if (t > 1) {
-                                drv->cylinders = total_size;
-                                rem = do_div(drv->cylinders, t);
-                        }
+                }
+                drv->block_size = block_size;
+                drv->nr_blocks = total_size;
+                t = drv->heads * drv->sectors;
+                if (t > 1) {
+                        unsigned rem = sector_div(total_size, t);
+                        if (rem)
+                                total_size++;
+                        drv->cylinders = total_size;
                 }
         } else {                /* Get geometry failed */
                 printk(KERN_WARNING "cciss: reading geometry failed\n");
@@ -1996,8 +1998,8 @@ cciss_read_capacity(int ctlr, int logvol, int withirq, sector_t *total_size,
                 *block_size = BLOCK_SIZE;
         }
         if (*total_size != (__u32) 0)
-                printk(KERN_INFO "      blocks= %lld block_size= %d\n",
-                *total_size, *block_size);
+                printk(KERN_INFO "      blocks= %llu block_size= %d\n",
+                (unsigned long long)*total_size, *block_size);
         kfree(buf);
         return;
 }
@@ -2031,8 +2033,8 @@ cciss_read_capacity_16(int ctlr, int logvol, int withirq, sector_t *total_size,
                 *total_size = 0;
                 *block_size = BLOCK_SIZE;
         }
-        printk(KERN_INFO "      blocks= %lld block_size= %d\n",
-               *total_size, *block_size);
+        printk(KERN_INFO "      blocks= %llu block_size= %d\n",
+               (unsigned long long)*total_size, *block_size);
         kfree(buf);
         return;
 }
diff --git a/drivers/block/cpqarray.c b/drivers/block/cpqarray.c
index 570d2f049323..d5f519ebbc08 100644
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
@@ -998,6 +998,7 @@ static inline void complete_buffers(struct bio *bio, int ok)
  */
 static inline void complete_command(cmdlist_t *cmd, int timeout)
 {
+        struct request *rq = cmd->rq;
         int ok=1;
         int i, ddir;
 
@@ -1029,12 +1030,18 @@ static inline void complete_command(cmdlist_t *cmd, int timeout)
                 pci_unmap_page(hba[cmd->ctlr]->pci_dev, cmd->req.sg[i].addr,
                                 cmd->req.sg[i].size, ddir);
 
-        complete_buffers(cmd->rq->bio, ok);
+        complete_buffers(rq->bio, ok);
 
-        add_disk_randomness(cmd->rq->rq_disk);
+        if (blk_fs_request(rq)) {
+                const int rw = rq_data_dir(rq);
 
-        DBGPX(printk("Done with %p\n", cmd->rq););
-        end_that_request_last(cmd->rq, ok ? 1 : -EIO);
+                disk_stat_add(rq->rq_disk, sectors[rw], rq->nr_sectors);
+        }
+
+        add_disk_randomness(rq->rq_disk);
+
+        DBGPX(printk("Done with %p\n", rq););
+        end_that_request_last(rq, ok ? 1 : -EIO);
 }
 
 /*