ipc: remove the ipc_get() routine

[safe/jmp/linux-2.6] / block / ll_rw_blk.c

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 524404b..8025d64 100644 (file)
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1322,8 +1322,8 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
                  struct scatterlist *sglist)
 {
        struct bio_vec *bvec, *bvprv;
-       struct scatterlist *next_sg, *sg;
        struct req_iterator iter;
+       struct scatterlist *sg;
        int nsegs, cluster;
 
        nsegs = 0;
@@ -1333,7 +1333,7 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
         * for each bio in rq
         */
        bvprv = NULL;
-       sg = next_sg = &sglist[0];
+       sg = NULL;
        rq_for_each_segment(bvec, rq, iter) {
                int nbytes = bvec->bv_len;
 
@@ -1349,9 +1349,12 @@ int blk_rq_map_sg(struct request_queue *q, struct request *rq,
                        sg->length += nbytes;
                } else {
 new_segment:
-                       sg = next_sg;
-                       next_sg = sg_next(sg);
+                       if (!sg)
+                               sg = sglist;
+                       else
+                               sg = sg_next(sg);
 
+                       memset(sg, 0, sizeof(*sg));
                        sg->page = bvec->bv_page;
                        sg->length = nbytes;
                        sg->offset = bvec->bv_offset;
@@ -3364,7 +3367,7 @@ void submit_bio(int rw, struct bio *bio)
                if (unlikely(block_dump)) {
                        char b[BDEVNAME_SIZE];
                        printk(KERN_DEBUG "%s(%d): %s block %Lu on %s\n",
-                               current->comm, current->pid,
+                       current->comm, task_pid_nr(current),
                                (rw & WRITE) ? "WRITE" : "READ",
                                (unsigned long long)bio->bi_sector,
                                bdevname(bio->bi_bdev,b));
@@ -3736,7 +3739,7 @@ EXPORT_SYMBOL(end_dequeued_request);
 
 /**
  * end_request - end I/O on the current segment of the request
- * @rq:                the request being processed
+ * @req:       the request being processed
  * @uptodate:  error value or 0/1 uptodate flag
  *
  * Description: