xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into for-2.6.31

Browse Source 
Conflicts:
	drivers/block/hd.c
	drivers/block/mg_disk.c

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
This commit is contained in:
Jens Axboe
2009-05-22 20:25:34 +02:00
parent b9ed7252d2 279e677faa
commit e4b636366c
976 changed files with 23664 additions and 19444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
block/blk-core.c
View File

@@ -1935,10 +1935,10 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes)
} else {
int idx = bio->bi_idx + next_idx;
if (unlikely(bio->bi_idx >= bio->bi_vcnt)) {
if (unlikely(idx >= bio->bi_vcnt)) {
blk_dump_rq_flags(req, "__end_that");
printk(KERN_ERR "%s: bio idx %d >= vcnt %d\n",
__func__, bio->bi_idx, bio->bi_vcnt);
__func__, idx, bio->bi_vcnt);
break;
}