diff options
Diffstat (limited to 'drivers/block/xd.c')
-rw-r--r-- | drivers/block/xd.c | 41 |
1 files changed, 18 insertions, 23 deletions
diff --git a/drivers/block/xd.c b/drivers/block/xd.c index 64b496fce98..ce242921992 100644 --- a/drivers/block/xd.c +++ b/drivers/block/xd.c | |||
@@ -305,30 +305,25 @@ static void do_xd_request (struct request_queue * q) | |||
305 | if (xdc_busy) | 305 | if (xdc_busy) |
306 | return; | 306 | return; |
307 | 307 | ||
308 | while ((req = elv_next_request(q)) != NULL) { | 308 | req = blk_fetch_request(q); |
309 | unsigned block = req->sector; | 309 | while (req) { |
310 | unsigned count = req->nr_sectors; | 310 | unsigned block = blk_rq_pos(req); |
311 | int rw = rq_data_dir(req); | 311 | unsigned count = blk_rq_cur_sectors(req); |
312 | XD_INFO *disk = req->rq_disk->private_data; | 312 | XD_INFO *disk = req->rq_disk->private_data; |
313 | int res = 0; | 313 | int res = -EIO; |
314 | int retry; | 314 | int retry; |
315 | 315 | ||
316 | if (!blk_fs_request(req)) { | 316 | if (!blk_fs_request(req)) |
317 | end_request(req, 0); | 317 | goto done; |
318 | continue; | 318 | if (block + count > get_capacity(req->rq_disk)) |
319 | } | 319 | goto done; |
320 | if (block + count > get_capacity(req->rq_disk)) { | ||
321 | end_request(req, 0); | ||
322 | continue; | ||
323 | } | ||
324 | if (rw != READ && rw != WRITE) { | ||
325 | printk("do_xd_request: unknown request\n"); | ||
326 | end_request(req, 0); | ||
327 | continue; | ||
328 | } | ||
329 | for (retry = 0; (retry < XD_RETRIES) && !res; retry++) | 320 | for (retry = 0; (retry < XD_RETRIES) && !res; retry++) |
330 | res = xd_readwrite(rw, disk, req->buffer, block, count); | 321 | res = xd_readwrite(rq_data_dir(req), disk, req->buffer, |
331 | end_request(req, res); /* wrap up, 0 = fail, 1 = success */ | 322 | block, count); |
323 | done: | ||
324 | /* wrap up, 0 = success, -errno = fail */ | ||
325 | if (!__blk_end_request_cur(req, res)) | ||
326 | req = blk_fetch_request(q); | ||
332 | } | 327 | } |
333 | } | 328 | } |
334 | 329 | ||
@@ -418,7 +413,7 @@ static int xd_readwrite (u_char operation,XD_INFO *p,char *buffer,u_int block,u_ | |||
418 | printk("xd%c: %s timeout, recalibrating drive\n",'a'+drive,(operation == READ ? "read" : "write")); | 413 | printk("xd%c: %s timeout, recalibrating drive\n",'a'+drive,(operation == READ ? "read" : "write")); |
419 | xd_recalibrate(drive); | 414 | xd_recalibrate(drive); |
420 | spin_lock_irq(&xd_lock); | 415 | spin_lock_irq(&xd_lock); |
421 | return (0); | 416 | return -EIO; |
422 | case 2: | 417 | case 2: |
423 | if (sense[0] & 0x30) { | 418 | if (sense[0] & 0x30) { |
424 | printk("xd%c: %s - ",'a'+drive,(operation == READ ? "reading" : "writing")); | 419 | printk("xd%c: %s - ",'a'+drive,(operation == READ ? "reading" : "writing")); |
@@ -439,7 +434,7 @@ static int xd_readwrite (u_char operation,XD_INFO *p,char *buffer,u_int block,u_ | |||
439 | else | 434 | else |
440 | printk(" - no valid disk address\n"); | 435 | printk(" - no valid disk address\n"); |
441 | spin_lock_irq(&xd_lock); | 436 | spin_lock_irq(&xd_lock); |
442 | return (0); | 437 | return -EIO; |
443 | } | 438 | } |
444 | if (xd_dma_buffer) | 439 | if (xd_dma_buffer) |
445 | for (i=0; i < (temp * 0x200); i++) | 440 | for (i=0; i < (temp * 0x200); i++) |
@@ -448,7 +443,7 @@ static int xd_readwrite (u_char operation,XD_INFO *p,char *buffer,u_int block,u_ | |||
448 | count -= temp, buffer += temp * 0x200, block += temp; | 443 | count -= temp, buffer += temp * 0x200, block += temp; |
449 | } | 444 | } |
450 | spin_lock_irq(&xd_lock); | 445 | spin_lock_irq(&xd_lock); |
451 | return (1); | 446 | return 0; |
452 | } | 447 | } |
453 | 448 | ||
454 | /* xd_recalibrate: recalibrate a given drive and reset controller if necessary */ | 449 | /* xd_recalibrate: recalibrate a given drive and reset controller if necessary */ |