Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

block: ll_rw_blk.c: cosmetics

Browse source 
Fix ?: construct, a typo, whitespace, and similar.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe 2007-07-18 13:13:10 +02:00
parent 65a6ec0d72
commit 4fa253f33c
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
block/ll_rw_blk.c
View file

@ -377,10 +377,12 @@ void blk_ordered_complete_seq(struct request_queue *q, unsigned seq, int error)
/* /*
* Okay, sequence complete. * Okay, sequence complete.
*/ */
rq = q->orig_bar_rq; uptodate = 1;
uptodate = q->orderr ? q->orderr : 1; if (q->orderr)
uptodate = q->orderr;
q->ordseq = 0; q->ordseq = 0;
rq = q->orig_bar_rq;
end_that_request_first(rq, uptodate, rq->hard_nr_sectors); end_that_request_first(rq, uptodate, rq->hard_nr_sectors);
end_that_request_last(rq, uptodate); end_that_request_last(rq, uptodate);
@ -445,7 +447,8 @@ static inline struct request *start_ordered(struct request_queue *q,
rq_init(q, rq); rq_init(q, rq);
if (bio_data_dir(q->orig_bar_rq->bio) == WRITE) if (bio_data_dir(q->orig_bar_rq->bio) == WRITE)
rq->cmd_flags |= REQ_RW; rq->cmd_flags |= REQ_RW;
rq->cmd_flags |= q->ordered & QUEUE_ORDERED_FUA ? REQ_FUA : 0; if (q->ordered & QUEUE_ORDERED_FUA)
rq->cmd_flags |= REQ_FUA;
rq->elevator_private = NULL; rq->elevator_private = NULL;
rq->elevator_private2 = NULL; rq->elevator_private2 = NULL;
init_request_from_bio(rq, q->orig_bar_rq->bio); init_request_from_bio(rq, q->orig_bar_rq->bio);
@ -3191,7 +3194,7 @@ end_io:
break; break;
} }
if (unlikely(bio_sectors(bio) > q->max_hw_sectors)) { if (unlikely(nr_sectors > q->max_hw_sectors)) {
printk("bio too big device %s (%u > %u)\n", printk("bio too big device %s (%u > %u)\n",
bdevname(bio->bi_bdev, b), bdevname(bio->bi_bdev, b),
bio_sectors(bio), bio_sectors(bio),
@ -3212,7 +3215,7 @@ end_io:
blk_partition_remap(bio); blk_partition_remap(bio);
if (old_sector != -1) if (old_sector != -1)
blk_add_trace_remap(q, bio, old_dev, bio->bi_sector, blk_add_trace_remap(q, bio, old_dev, bio->bi_sector,
old_sector); old_sector);
blk_add_trace_bio(q, bio, BLK_TA_QUEUE); blk_add_trace_bio(q, bio, BLK_TA_QUEUE);
@ -3564,7 +3567,7 @@ static struct notifier_block blk_cpu_notifier __cpuinitdata = {
* Description: * Description:
* Ends all I/O on a request. It does not handle partial completions, * Ends all I/O on a request. It does not handle partial completions,
* unless the driver actually implements this in its completion callback * unless the driver actually implements this in its completion callback
* through requeueing. Theh actual completion happens out-of-order, * through requeueing. The actual completion happens out-of-order,
* through a softirq handler. The user must have registered a completion * through a softirq handler. The user must have registered a completion
* callback through blk_queue_softirq_done(). * callback through blk_queue_softirq_done().
**/ **/