tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.dk/linux-2.6-block

* 'for-linus' of git://git.kernel.dk/linux-2.6-block:
ubd: fix incorrect sector handling during request restart
ps3disk: passing wrong variable to bvec_kunmap_irq()

Linus Torvalds 264780c2 8fd01d6c

+6 -5
+5 -4
arch/um/drivers/ubd_kern.c
··· 163 163 struct scatterlist sg[MAX_SG]; 164 164 struct request *request; 165 165 int start_sg, end_sg; 166 + sector_t rq_pos; 166 167 }; 167 168 168 169 #define DEFAULT_COW { \ ··· 188 187 .request = NULL, \ 189 188 .start_sg = 0, \ 190 189 .end_sg = 0, \ 190 + .rq_pos = 0, \ 191 191 } 192 192 193 193 /* Protected by ubd_lock */ ··· 1230 1228 { 1231 1229 struct io_thread_req *io_req; 1232 1230 struct request *req; 1233 - sector_t sector; 1234 1231 int n; 1235 1232 1236 1233 while(1){ ··· 1240 1239 return; 1241 1240 1242 1241 dev->request = req; 1242 + dev->rq_pos = blk_rq_pos(req); 1243 1243 dev->start_sg = 0; 1244 1244 dev->end_sg = blk_rq_map_sg(q, req, dev->sg); 1245 1245 } 1246 1246 1247 1247 req = dev->request; 1248 - sector = blk_rq_pos(req); 1249 1248 while(dev->start_sg < dev->end_sg){ 1250 1249 struct scatterlist *sg = &dev->sg[dev->start_sg]; 1251 1250 ··· 1257 1256 return; 1258 1257 } 1259 1258 prepare_request(req, io_req, 1260 - (unsigned long long)sector << 9, 1259 + (unsigned long long)dev->rq_pos << 9, 1261 1260 sg->offset, sg->length, sg_page(sg)); 1262 1261 1263 - sector += sg->length >> 9; 1264 1262 n = os_write_file(thread_fd, &io_req, 1265 1263 sizeof(struct io_thread_req *)); 1266 1264 if(n != sizeof(struct io_thread_req *)){ ··· 1272 1272 return; 1273 1273 } 1274 1274 1275 + dev->rq_pos += sg->length >> 9; 1275 1276 dev->start_sg++; 1276 1277 } 1277 1278 dev->end_sg = 0;
+1 -1
drivers/block/ps3disk.c
··· 113 113 memcpy(buf, dev->bounce_buf+offset, size); 114 114 offset += size; 115 115 flush_kernel_dcache_page(bvec->bv_page); 116 - bvec_kunmap_irq(bvec, &flags); 116 + bvec_kunmap_irq(buf, &flags); 117 117 i++; 118 118 } 119 119 }