aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_lib.c
diff options
context:
space:
mode:
authorMike Christie <michaelc@cs.wisc.edu>2005-12-05 03:37:06 -0500
committerJames Bottomley <jejb@mulgrave.(none)>2005-12-15 18:11:40 -0500
commitdefd94b75409b983f94548ea2f52ff5787ddb848 (patch)
tree0138b2dae748de88edaee4da23431f1a9dd347a1 /drivers/scsi/scsi_lib.c
parent8b05b773b6030de5b1bab1cbb0bf1ff8c34cdbe0 (diff)
[SCSI] seperate max_sectors from max_hw_sectors
- export __blk_put_request and blk_execute_rq_nowait needed for async REQ_BLOCK_PC requests - seperate max_hw_sectors and max_sectors for block/scsi_ioctl.c and SG_IO bio.c helpers per Jens's last comments. Since block/scsi_ioctl.c SG_IO was already testing against max_sectors and SCSI-ml was setting max_sectors and max_hw_sectors to the same value this does not change any scsi SG_IO behavior. It only prepares ll_rw_blk.c, scsi_ioctl.c and bio.c for when SCSI-ml begins to set a valid max_hw_sectors for all LLDs. Today if a LLD does not set it SCSI-ml sets it to a safe default and some LLDs set it to a artificial low value to overcome memory and feedback issues. Note: Since we now cap max_sectors to BLK_DEF_MAX_SECTORS, which is 1024, drivers that used to call blk_queue_max_sectors with a large value of max_sectors will now see the fs requests capped to BLK_DEF_MAX_SECTORS. Signed-off-by: Mike Christie <michaelc@cs.wisc.edu> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/scsi_lib.c')
-rw-r--r--drivers/scsi/scsi_lib.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 54a72f197487..14ad2a785a34 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -462,6 +462,7 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
462 req = blk_get_request(sdev->request_queue, write, gfp); 462 req = blk_get_request(sdev->request_queue, write, gfp);
463 if (!req) 463 if (!req)
464 goto free_sense; 464 goto free_sense;
465 req->flags |= REQ_BLOCK_PC | REQ_QUIET;
465 466
466 if (use_sg) 467 if (use_sg)
467 err = scsi_req_map_sg(req, buffer, use_sg, bufflen, gfp); 468 err = scsi_req_map_sg(req, buffer, use_sg, bufflen, gfp);
@@ -477,7 +478,6 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd,
477 req->sense_len = 0; 478 req->sense_len = 0;
478 req->timeout = timeout; 479 req->timeout = timeout;
479 req->retries = retries; 480 req->retries = retries;
480 req->flags |= REQ_BLOCK_PC | REQ_QUIET;
481 req->end_io_data = sioc; 481 req->end_io_data = sioc;
482 482
483 sioc->data = privdata; 483 sioc->data = privdata;