oom: move prototypes to appropriate header file

[linux-2.6-omap-h63xx.git] / drivers / block / cciss.c

diff --git a/drivers/block/cciss.c b/drivers/block/cciss.c
index 084358a828e9de7f2e5fc27f48d47a523beb1ab5..3fb7e8bc436d1b39eb579efc5ddc7b1222d69e4b 100644 (file)
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
@@ -1191,10 +1191,9 @@ static inline void complete_buffers(struct bio *bio, int status)
 {
        while (bio) {
                struct bio *xbh = bio->bi_next;
-               int nr_sectors = bio_sectors(bio);
 
                bio->bi_next = NULL;
-               bio_endio(bio, nr_sectors << 9, status ? 0 : -EIO);
+               bio_endio(bio, status ? 0 : -EIO);
                bio = xbh;
        }
 }
@@ -2570,6 +2569,7 @@ static void do_cciss_request(struct request_queue *q)
               (int)creq->nr_sectors);
 #endif                         /* CCISS_DEBUG */
 
+       memset(tmp_sg, 0, sizeof(tmp_sg));
        seg = blk_rq_map_sg(q, creq, tmp_sg);
 
        /* get the DMA records for the setup */
@@ -3101,7 +3101,7 @@ static void cciss_getgeometry(int cntl_num)
        int i;
        int listlength = 0;
        __u32 lunid = 0;
-       int block_size;
+       unsigned block_size;
        sector_t total_size;
 
        ld_buff = kzalloc(sizeof(ReportLunData_struct), GFP_KERNEL);